Trigger conflicts for CHANGELOG.md changes on the release branch

eregon · eregon · commit bd41a9828b1d · 2020-01-28T15:45:32.000+01:00
diff --git a/.gitattributes b/.gitattributes
@@ -1,6 +1,5 @@
 # Merge options
 
-/CHANGELOG.md merge=union
 
 # Rules for GitHub's Linguist language-classification system. We're abusing the
 # 'vendored' attribute to exclude files as a lot of this isn't really vendored,
