Handle line endings and merge conflicts on NEWS

coatless · coatless · commit 8bcc19c38830 · 2018-07-01T13:12:34.000-05:00
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,5 @@
+# Set line ends automatically
+* text=auto
+
+# Handle multiple PR Updates
+NEWS.md merge=union
