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