fixed gitlab-ci conflict

21ebb2dd · Jan Provaznik · 58e6ad9d · 21ebb2dd
Commit 21ebb2dd authored Nov 22, 2018 by Jan Provaznik
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

.gitlab-ci.yml .gitlab-ci.yml +0 -7

No files found.
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -798,17 +798,10 @@ gitlab:assets:compile:
      - webpack-report/
      - public/assets/
  only:
-<<<<<<< HEAD
-    - branches@gitlab-org/gitlab-ce
-    - branches@gitlab-org/gitlab-ee
-    - tags@gitlab-org/gitlab-ce
-    - tags@gitlab-org/gitlab-ee
-=======
    - //@gitlab-org/gitlab-ce
    - //@gitlab-org/gitlab-ee
    - //@gitlab/gitabhq
    - //@gitlab/gitlab-ee
->>>>>>> upstream/master
  tags:
    - gitlab-org-delivery
    - high-cpu