Update .gitlab-ci.yml

2021-12-23 00:27:25 +00:00
parent 01ee141820
commit dc7e0a646a
1 changed files with 0 additions and 9 deletions
@@ -24,12 +24,8 @@ Build:
      - public
  only:
    - main
-<<<<<<< HEAD


-=======
->>>>>>> f07b1f2 (only build for changes made to main)
-
 Dockerize:
  stage: dockerize
  image:
@@ -42,8 +38,3 @@ Dockerize:
    - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
  only:
    - main
-<<<<<<< HEAD
-
-
-=======
->>>>>>> f07b1f2 (only build for changes made to main)