Merge pull request #738 from puppetlabs/msync_MODULES-6339

pmcmaw · web-flow · commit 3a65425d66e1 · 2018-01-08T14:07:51.000Z
(maint) modulesync 65530a4 Update Travis
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
-#This file is generated by ModuleSync, do not edit.Z
+# This file is generated by ModuleSync, do not edit.
 *.iml
 .*.sw[op]
 .DS_Store
diff --git a/.travis.yml b/.travis.yml
@@ -4,9 +4,6 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake release_checks"
-#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
-before_install:
-  - gem update bundler
 matrix:
   fast_finish: true
   include:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#This file is generated by ModuleSync, do not edit.Z`
	`1`	`+# This file is generated by ModuleSync, do not edit.`
`2`	`2`	`*.iml`
`3`	`3`	`.*.sw[op]`
`4`	`4`	`.DS_Store`