Adjust mr_widget_options.js conflicts

72432c46 · Oswaldo Ferreira · 0e7260d7 · 72432c46
Commit 72432c46 authored Aug 09, 2017 by Oswaldo Ferreira
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js ...javascripts/vue_merge_request_widget/mr_widget_options.js +0 -7

No files found.
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -38,10 +38,7 @@ export default {
  props: {
    mrData: {
      type: Object,
-<<<<<<< HEAD
-=======
      required: false,
->>>>>>> upstream/master
    },
  },
  data() {
@@ -251,13 +248,9 @@ export default {
          :state="mr.state"
          :related-links="mr.relatedLinks" />
      </div>
-<<<<<<< HEAD
-      <div class="mr-widget-footer" v-if="shouldRenderMergeHelp">
-=======
      <div
        class="mr-widget-footer"
        v-if="shouldRenderMergeHelp">
->>>>>>> upstream/master
        <mr-widget-merge-help />
      </div>
    </div>