From 23b97daa843f9a47c787ff7d48629b2aaee996a7 Mon Sep 17 00:00:00 2001
From: Dawa Ometto <dawa.ometto@phil.uu.nl>
Date: Sun, 29 Mar 2020 22:35:28 +0200
Subject: [PATCH] Fix Travis

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

diff --git a/.travis.yml b/.travis.yml
index e6a933c5..a1524638 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,4 @@
 rvm:
-<<<<<<< HEAD
   - 2.4.0
   - 2.6.0
   - jruby-9.2.7.0