Resolve ce-to-ee merge conflict

35606534 · Marin Jankovski · 8fbeec78 · 35606534
Commit 35606534 authored Sep 21, 2018 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

.gitlab-ci.yml .gitlab-ci.yml +1 -5

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -431,13 +431,9 @@ review-docs-cleanup:
 # Trigger a docker image build in CNG (Cloud Native GitLab) repository
 #
 cloud-native-image:
-  stage: build
+  stage: test
  image: ruby:2.4-alpine
  before_script: []
-<<<<<<< HEAD
-=======
-  stage: test
->>>>>>> upstream/master
  allow_failure: true
  cache: {}
  variables: