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