gitattributes: custom merge driver for ChangeLog not needed anymore

* .gitattributes: We don't maintain a version-controlled ChangeLog
file anymore, so we have no need to specify a custom merge driver
for it anymore.  Update accordingly.

diff --git a/.gitattributes b/.gitattributes
index 6fec56e1b83be32748224f9772dd59210c3332ba..5126add6d8e5da89ad82fbb8326fd54c8964dbcf 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1,2 @@
-ChangeLog merge=merge-changelog
 NEWS merge=union
 *.texi* diff=texinfo