fixed typo

queryverse · Jul 23, 2017 · b17039e · b17039e
1 parent 417b166
commit b17039e
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,11 +12,7 @@ addons:
     apt:
         packages:
             - xvfb
-<<<<<<< HEAD
-            - xauth        
-=======
             - xauth
->>>>>>> devl
             - libgtk-3-0
 script:
   - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
@@ -26,3 +22,4 @@ after_success:
   - julia -e 'cd(Pkg.dir("VegaLite")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
   - julia -e 'Pkg.add("Documenter")'
   - julia -e 'cd(Pkg.dir("VegaLite")); include(joinpath("docs", "make.jl"))'
+