Resolve conflict for .gitlab-ci.yml

607b9f8c · Lin Jen-Shin · 4f418b41 · 607b9f8c
Commit 607b9f8c authored Oct 24, 2018 by Lin Jen-Shin
Show 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
@@ -80,7 +80,6 @@ stages:
    - mysql:5.7
    - redis:alpine

-<<<<<<< HEAD
 # BEGIN EE-only service helpers

 .use-pg-9-6: &use-pg-9-6
@@ -107,8 +106,6 @@ stages:

 # END EE-only service helpers

-=======
->>>>>>> upstream/master
 .rails5: &rails5
  allow_failure: true
  only: