From 2b1b6055fcd6cd1b03d7f66364123414647d0e02 Mon Sep 17 00:00:00 2001
From: Carlo Sciolla <carlo.sciolla@gmail.com>
Date: Sat, 19 Aug 2017 21:27:33 +0200
Subject: [PATCH] Fixed travis configuration after merge

---
 .travis.yml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 63f5991..6ca85a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,11 @@
 language: emacs-lisp
 sudo: false
-<<<<<<< HEAD
-=======
 env:
   - EVM_EMACS=emacs-25.1-travis
->>>>>>> develop
 before_install:
   - curl -fsSkL https://gist.github.com/rejeep/ebcd57c3af83b049833b/raw > x.sh && source ./x.sh
   - evm install $EVM_EMACS --use --skip
   - cask
-<<<<<<< HEAD
-env:
-#  - EVM_EMACS=emacs-24.5-travis
-  - EVM_EMACS=emacs-25.1-travis
-=======
->>>>>>> develop
 script:
   - emacs --version
   - make test