Fixed travis configuration after merge

2017-08-19 21:27:33 +02:00 · 2017-08-19 21:27:33 +02:00 · 2b1b6055fc
parent 5a2e8d0dd2
commit 2b1b6055fc
1 changed files with 0 additions and 9 deletions
--- 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