meta: Use merge union for Changelog (#820)

getsentry · Oct 27, 2020 · 390b04a · 390b04a
1 parent a9c87f3
commit 390b04a
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union