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
1b0ce2a6
Commit
1b0ce2a6
authored
May 08, 2018
by
Ash McKenzie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts in spec/javascripts/vue_mr_widget/mock_data.js
parent
5c96525c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
3 deletions
+0
-3
spec/javascripts/vue_mr_widget/mock_data.js
spec/javascripts/vue_mr_widget/mock_data.js
+0
-3
No files found.
spec/javascripts/vue_mr_widget/mock_data.js
View file @
1b0ce2a6
...
...
@@ -216,7 +216,6 @@ export default {
diverged_commits_count
:
0
,
only_allow_merge_if_pipeline_succeeds
:
false
,
commit_change_content_path
:
'
/root/acets-app/merge_requests/22/commit_change_content
'
,
<<<<<<<
HEAD
codeclimate
:
{
head_path
:
'
head.json
'
,
base_path
:
'
base.json
'
,
...
...
@@ -225,8 +224,6 @@ export default {
base_path
:
'
blob_path
'
,
head_path
:
'
blob_path
'
,
},
=======
>>>>>>>
upstream
/
master
merge_commit_path
:
'
http://localhost:3000/root/acets-app/commit/53027d060246c8f47e4a9310fb332aa52f221775
'
,
};
// Codeclimate
...
...
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