Skip to content

G
gitlab-ce
Commit 607b9f8c authored by Lin Jen-Shin's avatar Lin Jen-Shin
Browse files
Options

Resolve conflict for .gitlab-ci.yml

parent 4f418b41
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
.gitlab-ci.yml
View file @ 607b9f8c
...@@ -80,7 +80,6 @@ stages: ...@@ -80,7 +80,6 @@ stages:
- mysql:5.7 - mysql:5.7
- redis:alpine - redis:alpine
<<<<<<< HEAD
# BEGIN EE-only service helpers # BEGIN EE-only service helpers
.use-pg-9-6: &use-pg-9-6 .use-pg-9-6: &use-pg-9-6
...@@ -107,8 +106,6 @@ stages: ...@@ -107,8 +106,6 @@ stages:
# END EE-only service helpers # END EE-only service helpers
=======
>>>>>>> upstream/master
.rails5: &rails5 .rails5: &rails5
allow_failure: true allow_failure: true
only: only:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7