Fixed merge conflict

2022-02-05 14:34:36 -05:00
parent 1c781c78c0
commit 09833fdfb1
1 changed files with 0 additions and 4 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,6 @@ jobs:
  include:
    - stage: test
      name: coverage
-<<<<<<< HEAD
-      script: cp -r $PWD ../build_coverage && cd ../build_coverage && ./ci/travis_run.py ./ci/regression.sh -coverage    
-=======
      script: cp -r $PWD ../build_coverage && cd ../build_coverage && ./ci/travis_run.py ./ci/regression.sh -coverage
    - stage: test
      name: coverage64
@@ -40,7 +37,6 @@ jobs:
    - stage: test
      name: tex
      script: cp -r $PWD ../build_tex && cd ../build_tex && ./ci/travis_run.py ./ci/regression.sh -tex
->>>>>>> xlen-parameterization
    - stage: test
      name: cluster
      script: cp -r $PWD ../build_cluster && cd ../build_cluster && ./ci/travis_run.py ./ci/regression.sh -cluster