Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_component.vue

38213c2e · Filipa Lacerda · 90417f68 · 38213c2e
Commit 38213c2e authored Jan 11, 2018 by Filipa Lacerda
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 12 deletions

app/assets/javascripts/cycle_analytics/components/stage_component.vue ...avascripts/cycle_analytics/components/stage_component.vue +0 -12

No files found.
--- a/app/assets/javascripts/cycle_analytics/components/stage_component.vue
+++ b/app/assets/javascripts/cycle_analytics/components/stage_component.vue
@@ -47,26 +47,14 @@
          <a
            :href="issue.url"
            class="issue-link"
-<<<<<<< HEAD
-          >
-            #{{ issue.iid }}
-          </a>
-=======
          >#{{ issue.iid }}</a>
->>>>>>> upstream/master
          &middot;
          <span>
            {{ s__('OpenedNDaysAgo|Opened') }}
            <a
              :href="issue.url"
              class="issue-date"
-<<<<<<< HEAD
-            >
-              {{ issue.createdAt }}
-            </a>
-=======
            >{{ issue.createdAt }}</a>
->>>>>>> upstream/master
          </span>
          <span>
            {{ s__('ByAuthor|by') }}