Commit e63280fa authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Fix mr_widget_header.js conflict

parent 5dd836e0
......@@ -70,7 +70,6 @@ export default {
</span>
</div>
<div class="normal">
<<<<<<< HEAD
<strong>
Request to merge
<span
......@@ -99,31 +98,6 @@ export default {
</a>
</span>
</strong>
=======
<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.targetBranchCommitsPath">{{mr.targetBranch}}</a>
</span>
>>>>>>> origin/master
<span
v-if="shouldShowCommitsBehindText"
class="diverged-commits-count">
......
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