Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
53056102
Commit
53056102
authored
Jan 24, 2018
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflict with .gitlab-ci.yml
parent
ad663560
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
.gitlab-ci.yml
.gitlab-ci.yml
+0
-3
No files found.
.gitlab-ci.yml
View file @
53056102
...
...
@@ -345,11 +345,8 @@ setup-test-env:
paths
:
-
tmp/tests
<<<<<<< HEAD
rspec-pg geo
:
*rspec-metadata-pg-geo
=======
>
>>>>>>
upstream/master
rspec-pg 0 27
:
*rspec-metadata-pg
rspec-pg 1 27
:
*rspec-metadata-pg
rspec-pg 2 27
:
*rspec-metadata-pg
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment