Commit 47bdfcae authored by Watson, Gregory's avatar Watson, Gregory
Browse files

Fix merge mess

parent 8b25f391

.dockerignore

+0 −4
Original line number Diff line number Diff line 
<<<<<<< before updating

dockerfiles

=======

dockerfiles/Dockerfile
 
>>>>>>> after updating

.gitlab-ci.yml

+0 −4
Original line number Diff line number Diff line
@@ -85,9 +85,6 @@ tag-release: 
  tags:

  - rse-multi-builder



<<<<<<< before updating

=======



build-image:

  stage: publish

  variables:
@@ -111,7 +108,6 @@ build-image: 
  tags:

    - rse-multi-builder



>>>>>>> after updating

package-build:

  stage: publish

  script: