From 11ef1fb45c95be048c96f0f3d5c8c51e8ad46f06 Mon Sep 17 00:00:00 2001
From: Nick Lewycky <nick@wasmer.io>
Date: Fri, 13 Sep 2019 14:03:22 -0700
Subject: [PATCH] Use union merge on the changelog file.

This keeps both sides of a conflict. It's essentially the same as removing the
conflict markers.
---
 .gitattributes | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitattributes b/.gitattributes
index 3426f1deeda..4cc803e8066 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 lib/emscripten/emtests/* linguist-vendored
 lib/spectests/spectests/* linguist-vendored
+CHANGELOG.md merge=union