Resolve mr_widget_rebase

ed4f0c0a · Luke Bennett · 4494be7f · ed4f0c0a
Commit ed4f0c0a authored Jan 11, 2018 by Luke Bennett
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue ...rge_request_widget/components/states/mr_widget_rebase.vue +0 -4

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -107,12 +107,8 @@
      <template v-if="!mr.rebaseInProgress && mr.canPushToSourceBranch && !isMakingRequest">
        <div
          class="accept-merge-holder clearfix
-<<<<<<< HEAD
 js-toggle-container accept-action media space-children"
        >
-=======
-js-toggle-container accept-action media space-children">
->>>>>>> upstream/master
          <button
            type="button"
            class="btn btn-sm btn-reopen btn-success"