From 9941930af6171b20cf64e88c533dc8c7ed9171cc Mon Sep 17 00:00:00 2001
From: Jose Ivan Vargas <jvargas@gitlab.com>
Date: Fri, 19 May 2017 00:52:59 -0500
Subject: Resolve mr_widget_header conflict

---
 .../components/mr_widget_header.js                 | 29 ----------------------
 1 file changed, 29 deletions(-)

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
index 1455641cfff..272dae25455 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_header.js
@@ -61,34 +61,6 @@ export default {
         </span>
       </div>
       <div class="normal">
-<<<<<<< HEAD
-        <b>Request to merge</b>
-        <span
-          class="label-branch"
-          :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.sourceBranch)}"
-          :title="isBranchTitleLong(mr.sourceBranch) ? mr.sourceBranch : ''"
-          data-placement="bottom"
-          v-html="mr.sourceBranchLink"></span>
-        <button
-          class="btn btn-transparent btn-clipboard has-tooltip"
-          data-title="Copy branch name to clipboard"
-          :data-clipboard-text="mr.sourceBranch">
-          <i
-            aria-hidden="true"
-            class="fa fa-clipboard"></i>
-        </button>
-        <b>into</b>
-        <span
-          class="label-branch"
-          :class="{'label-truncated has-tooltip': isBranchTitleLong(mr.targetBranch)}"
-          :title="isBranchTitleLong(mr.targetBranch) ? mr.targetBranch : ''"
-          data-placement="bottom">
-          <a
-            :href="mr.targetBranchPath">
-            {{mr.targetBranch}}
-          </a>
-        </span>
-=======
         <strong>
           Request to merge
           <span
@@ -114,7 +86,6 @@ export default {
             <a :href="mr.targetBranchPath">{{mr.targetBranch}}</a>
           </span>
         </strong>
->>>>>>> 4de3d0b... Merge branch 'fix-trailing-space-mr-widget' into 'master'
         <span
           v-if="shouldShowCommitsBehindText"
           class="diverged-commits-count">
-- 
cgit v1.2.1