Fix conflicts for spec/javascripts/vue_mr_widget/mock_data.js

spec/javascripts/vue_mr_widget/mock_data.js

@@ -159,7 +159,6 @@ export default {
         avatar_url:
           'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
         web_url: 'http://localhost:3000/root',
-<<<<<<< HEAD
       },
       author_gravatar_url:
         'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
@@ -394,62 +393,3 @@ export const codequalityParsedIssues = [
     urlPath: 'foo/Gemfile.lock',
   },
 ];
-=======
-      },
-      author_gravatar_url:
-        'https://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon',
-      commit_url:
-        'http://localhost:3000/root/acets-app/commit/104096c51715e12e7ae41f9333e9fa35b73f385d',
-      commit_path: '/root/acets-app/commit/104096c51715e12e7ae41f9333e9fa35b73f385d',
-    },
-    retry_path: '/root/acets-app/pipelines/172/retry',
-    created_at: '2017-04-07T12:27:19.520Z',
-    updated_at: '2017-04-07T15:28:44.800Z',
-  },
-  work_in_progress: false,
-  source_branch_exists: false,
-  mergeable_discussions_state: true,
-  conflicts_can_be_resolved_in_ui: false,
-  branch_missing: true,
-  commits_count: 1,
-  has_conflicts: false,
-  can_be_merged: true,
-  has_ci: true,
-  ci_status: 'success',
-  pipeline_status_path: '/root/acets-app/merge_requests/22/pipeline_status',
-  issues_links: {
-    closing: '',
-    mentioned_but_not_closing: '',
-  },
-  current_user: {
-    can_resolve_conflicts: true,
-    can_remove_source_branch: false,
-    can_revert_on_current_merge_request: true,
-    can_cherry_pick_on_current_merge_request: true,
-  },
-  target_branch_path: '/root/acets-app/branches/master',
-  source_branch_path: '/root/acets-app/branches/daaaa',
-  conflict_resolution_ui_path: '/root/acets-app/merge_requests/22/conflicts',
-  remove_wip_path: '/root/acets-app/merge_requests/22/remove_wip',
-  cancel_merge_when_pipeline_succeeds_path:
-    '/root/acets-app/merge_requests/22/cancel_merge_when_pipeline_succeeds',
-  create_issue_to_resolve_discussions_path:
-    '/root/acets-app/issues/new?merge_request_to_resolve_discussions_of=22',
-  merge_path: '/root/acets-app/merge_requests/22/merge',
-  cherry_pick_in_fork_path:
-    '/root/acets-app/forks?continue%5Bnotice%5D=You%27re+not+allowed+to+make+changes+to+this+project+directly.+A+fork+of+this+project+has+been+created+that+you+can+make+changes+in%2C+so+you+can+submit+a+merge+request.+Try+to+revert+this+commit+again.&continue%5Bnotice_now%5D=You%27re+not+allowed+to+make+changes+to+this+project+directly.+A+fork+of+this+project+is+being+created+that+you+can+make+changes+in%2C+so+you+can+submit+a+merge+request.&continue%5Bto%5D=%2Froot%2Facets-app%2Fmerge_requests%2F22&namespace_key=1',
-  revert_in_fork_path:
-    '/root/acets-app/forks?continue%5Bnotice%5D=You%27re+not+allowed+to+make+changes+to+this+project+directly.+A+fork+of+this+project+has+been+created+that+you+can+make+changes+in%2C+so+you+can+submit+a+merge+request.+Try+to+cherry-pick+this+commit+again.&continue%5Bnotice_now%5D=You%27re+not+allowed+to+make+changes+to+this+project+directly.+A+fork+of+this+project+is+being+created+that+you+can+make+changes+in%2C+so+you+can+submit+a+merge+request.&continue%5Bto%5D=%2Froot%2Facets-app%2Fmerge_requests%2F22&namespace_key=1',
-  email_patches_path: '/root/acets-app/merge_requests/22.patch',
-  plain_diff_path: '/root/acets-app/merge_requests/22.diff',
-  status_path: '/root/acets-app/merge_requests/22.json',
-  merge_check_path: '/root/acets-app/merge_requests/22/merge_check',
-  ci_environments_status_url: '/root/acets-app/merge_requests/22/ci_environments_status',
-  project_archived: false,
-  merge_commit_message_with_description:
-    "Merge branch 'daaaa' into 'master'\n\nUpdate README.md\n\nSee merge request !22",
-  diverged_commits_count: 0,
-  only_allow_merge_if_pipeline_succeeds: false,
-  commit_change_content_path: '/root/acets-app/merge_requests/22/commit_change_content',
-};
->>>>>>> upstream/master