From 1ad3f9651b0cdc75b7efd819b112ffa1efa16538 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Mon, 30 May 2016 08:42:20 +0200
Subject: Removed merge issue     * .travis.yml:

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2c7b0f4..ea1f1c1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,6 @@ rvm:
   - jruby-19mode
   - jruby-head
   - rbx-2
->>>>>>> de2e2acd91988e6b54f50f6c44ad85f28b68c615
 branches:
   only:
     - master
-- 
cgit v1.2.1