Resolve conflicts in .gitlab-ci.yml

e98113d3 · Stan Hu · 90e1b3ab · e98113d3
Commit e98113d3 authored Oct 24, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

.gitlab-ci.yml .gitlab-ci.yml +0 -3

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1192,9 +1192,6 @@ schedule:review_apps_cleanup:
      - schedules@gitlab-org/gitlab-ee
    kubernetes: active
  except:
-<<<<<<< HEAD
-=======
    - master
->>>>>>> upstream/master
    - tags
    - /(^docs[\/-].*|.*-docs$)/