Update .travis.yml for long tests (master branch only)

2017-03-10 10:38:23 -08:00
parent cbc5225d38
commit c4f2490050
2 changed files with 41 additions and 161 deletions
@@ -19,3 +19,6 @@
 # Windows
 *.bat text eol=crlf
 *.cmd text eol=crlf
+
+# .travis.yml merging
+.travis.yml merge=ours