1 files changed, 3 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
index 6212bd4..9eb12c0 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -19,3 +19,6 @@
 # Windows
 *.bat text eol=crlf
 *.cmd text eol=crlf
+
+# .travis.yml merging
+.travis.yml merge=ours