remove merge conflict trace

a5a1999f · Forest Gregg · 2f7e7ae7 · a5a1999f
Commit a5a1999f authored Mar 29, 2016 by Forest Gregg
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

.travis.yml .travis.yml +0 -1

No files found.
--- a/.travis.yml
+++ b/.travis.yml
 language: python
 sudo: false
-<<<<<<< HEAD
 matrix:
    include:
        - os: linux