union merge for NEWS.md [ci skip]

daqana · Dec 11, 2014 · 35422d6 · 35422d6
1 parent f9ab903
commit 35422d6
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+/NEWS.md merge=union