X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=.gitattributes;h=0d86adb5e5c65dd562e4d34d38888a2eccb16823;hb=9c813963e2f67cbf4604a1a1947c2ff779ecc8f0;hp=5126add6d8e5da89ad82fbb8326fd54c8964dbcf;hpb=2a2500cef5aaea77789a0f7bfc5d9b12c7a1b61f;p=platform%2Fupstream%2Fautomake.git

diff --git a/.gitattributes b/.gitattributes
index 5126add..0d86adb 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1 @@
-NEWS merge=union
 *.texi* diff=texinfo