Commit 1b0ce2a6 authored by Ash McKenzie's avatar Ash McKenzie

Resolve conflicts in spec/javascripts/vue_mr_widget/mock_data.js

parent 5c96525c
......@@ -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
......
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