block merging of travis settings from 2.x

cowtowncoder · cowtowncoder · commit 6faeaf972113 · 2018-01-05T13:59:12.000-08:00
diff --git a/.gitattributes b/.gitattributes
@@ -5,6 +5,7 @@
 # (and if ever need to disable change `true` to `false`
 
 pom.xml merge=ours
+.travis.yml merge=ours
 
 # 28-Sep-2017, tatu: For 2.x -> 3.0 also block these
 
