Added gitattributes [ci skip]

docker-flow · Sep 3, 2016 · f0ea234 · f0ea234
1 parent 67d1181
commit f0ea234
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.travis.yml merge=ours