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
f2cde435
Commit
f2cde435
authored
Dec 04, 2018
by
Yorick Peterse
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolved .gitlab-ci.yml merge conflict
parent
ddd41853
Changes
1
Show 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 @
f2cde435
...
@@ -1221,10 +1221,7 @@ merge:master:
...
@@ -1221,10 +1221,7 @@ merge:master:
-
$MERGE_TRAIN_SSH_PUBLIC_KEY
-
$MERGE_TRAIN_SSH_PUBLIC_KEY
-
$MERGE_TRAIN_SSH_PRIVATE_KEY
-
$MERGE_TRAIN_SSH_PRIVATE_KEY
-
$MERGE_TRAIN_API_TOKEN
-
$MERGE_TRAIN_API_TOKEN
<<<<<<< HEAD
=======
-
$MERGE_FORCE_ENABLE
-
$MERGE_FORCE_ENABLE
>
>>>>>>
upstream/master
script
:
script
:
-
scripts/merge-train
-
scripts/merge-train
cache
:
cache
:
...
...
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