Use union merge on the changelog file.

This keeps both sides of a conflict. It's essentially the same as removing the conflict markers.
wasmerio · Sep 13, 2019 · 11ef1fb · 11ef1fb
1 parent fa760f4
commit 11ef1fb
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +1,3 @@
 lib/emscripten/emtests/* linguist-vendored
 lib/spectests/spectests/* linguist-vendored
+CHANGELOG.md merge=union