Fix conflicts for...

Fix conflicts for app/assets/javascripts/cycle_analytics/components/stage_test_component.vue [ci skip]

Fix conflicts for...
Fix conflicts for app/assets/javascripts/cycle_analytics/components/stage_test_component.vue [ci skip]
55a5ac70 · Filipa Lacerda · 9b28613a · 55a5ac70
Commit 55a5ac70 authored Jan 11, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 10 deletions

app/assets/javascripts/cycle_analytics/components/stage_test_component.vue ...ripts/cycle_analytics/components/stage_test_component.vue +0 -10

No files found.
--- a/app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
+++ b/app/assets/javascripts/cycle_analytics/components/stage_test_component.vue
@@ -80,24 +80,14 @@
            </span>
            <a
              :href="build.commitUrl"
-<<<<<<< HEAD
-              class="commit-sha"
-            >
-=======
              class="commit-sha">
->>>>>>> upstream/master
              {{ build.shortSha }}
            </a>
          </h5>
          <span>
            <a
              :href="build.url"
-<<<<<<< HEAD
-              class="issue-date"
-            >
-=======
              class="issue-date">
->>>>>>> upstream/master
              {{ build.date }}
            </a>
          </span>