Removed merge issue

jwillemsen · jwillemsen · commit 1ad3f9651b0c · 2016-05-30T08:42:20.000+02:00
* .travis.yml:
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,6 @@ rvm:
   - jruby-19mode
   - jruby-head
   - rbx-2
->>>>>>> de2e2acd91988e6b54f50f6c44ad85f28b68c615
 branches:
   only:
     - master
