fix merge error

2019-05-10 13:44:35 -07:00
parent 7aff09ce48
commit b85856266f
1 changed files with 0 additions and 4 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,3 @@ build:
    - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
  except:
    - master
-<<<<<<< HEAD
-
-=======
->>>>>>> c80658da6110e2c9095cdbd249c5583509c16a7a