Resolve conflict in mr_widget_merge_when_pipeline_succeeds.vue

209e4985 · Rémy Coutable · 7d85e0b6 · 209e4985
Commit 209e4985 authored Jan 26, 2018 by Rémy Coutable
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue ...ponents/states/mr_widget_merge_when_pipeline_succeeds.vue +0 -6

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merge_when_pipeline_succeeds.vue
@@ -84,15 +84,9 @@
    <div class="media-body">
      <h4 class="flex-container-block">
        <span class="append-right-10">
-<<<<<<< HEAD
-          Set by
-          <mr-widget-author :author="mr.setToMWPSBy" />
-          to be merged automatically when the pipeline succeeds
-=======
          {{ s__("mrWidget|Set by") }}
          <mr-widget-author :author="mr.setToMWPSBy" />
          {{ s__("mrWidget|to be merged automatically when the pipeline succeeds") }}
->>>>>>> upstream/master
        </span>
        <a
          v-if="mr.canCancelAutomaticMerge"