[ travis ] keep our .travis.yml file

jamesmckinna · Apr 22, 2019 · 3e179e4 · 3e179e4
1 parent 0c1d608
commit 3e179e4
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.travis.yml merge=ours