X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=.gitattributes;h=0d86adb5e5c65dd562e4d34d38888a2eccb16823;hb=0164f83126647476cfb3112441185accdcb157fb;hp=b6c36149c2d074a6e4ff7cbcfe69fa6d28a6d4dc;hpb=319d2c66df5240c9231f75f40d77c89cda4df87d;p=platform%2Fupstream%2Fautomake.git

diff --git a/.gitattributes b/.gitattributes
index b6c3614..0d86adb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-ChangeLog merge=merge-changelog
 *.texi* diff=texinfo