Fix conflict for...

Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_review_component.vue [ci skip]

Fix conflict for...
Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_review_component.vue [ci skip]
726a5b67 · Filipa Lacerda · aa08d9ce · 726a5b67
Commit 726a5b67 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/assets/javascripts/cycle_analytics/components/stage_review_component.vue ...pts/cycle_analytics/components/stage_review_component.vue +0 -6

No files found.
--- a/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
+++ b/app/assets/javascripts/cycle_analytics/components/stage_review_component.vue
@@ -46,13 +46,7 @@
          <a
            :href="mergeRequest.url"
            class="issue-link"
-<<<<<<< HEAD
-          >
-            !{{ mergeRequest.iid }}
-          </a>
-=======
          >!{{ mergeRequest.iid }}</a>
->>>>>>> upstream/master
          &middot;
          <span>
            {{ s__('OpenedNDaysAgo|Opened') }}