Avoid merge conflicts in NEWS file

Kirill Müller · Kirill Müller · commit 3aeaa1f76eb4 · 2014-02-25T15:07:26.000+01:00
by using the `union` merge strategy. See also http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -2,3 +2,4 @@ visual_test
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$
+^/\.gitattributes$
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/NEWS merge=union
