X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=.gitattributes;h=0d86adb5e5c65dd562e4d34d38888a2eccb16823;hb=refs%2Fheads%2Faccepted%2Ftizen_ivi;hp=6fec56e1b83be32748224f9772dd59210c3332ba;hpb=f874f9eeb7d996a7fc56c11342e9a094a87a402a;p=platform%2Fupstream%2Fautomake.git

diff --git a/.gitattributes b/.gitattributes
index 6fec56e..0d86adb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1 @@
-ChangeLog merge=merge-changelog
-NEWS merge=union
 *.texi* diff=texinfo