diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..cd003ef4
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1 @@
+.travis.yml merge=ours