Revert "Use the "union" merge driver for changelogs"

neilmayhew · neilmayhew · commit c74d999372f0 · 2025-09-30T16:12:47.000-06:00
This reverts commit 4ae84de.
diff --git a/.gitattributes b/.gitattributes
@@ -1,2 +0,0 @@
-# In changelogs, take lines from both versions, instead of leaving conflict markers
-CHANGELOG.md merge=union

Original file line number	Diff line number	Diff line change
`@@ -1,2 +0,0 @@`
`1`		`-# In changelogs, take lines from both versions, instead of leaving conflict markers`
`2`		`-CHANGELOG.md merge=union`