Travis fixed.

joergen7 · joergen7 · commit 3ad7ca2cde4b · 2018-02-26T17:34:42.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -3,13 +3,10 @@ install:
 language: erlang
 script: ./rebar3 eunit
 otp_release:
-<<<<<<< HEAD
-=======
   - 20.2
   - 20.1
   - 20.0
   - 19.3
->>>>>>> dev
   - 19.2
   - 19.1
   - 19.0
