[ci skip] Fix conflict for...

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

[ci skip] Fix conflict for...
[ci skip] Fix conflict for app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
aa08d9ce · Filipa Lacerda · 66eabecb · aa08d9ce
Commit aa08d9ce 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_plan_component.vue ...ripts/cycle_analytics/components/stage_plan_component.vue +0 -6

No files found.
--- a/app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
+++ b/app/assets/javascripts/cycle_analytics/components/stage_plan_component.vue
@@ -57,13 +57,7 @@
            <a
              :href="commit.commitUrl"
              class="commit-hash-link commit-sha"
-<<<<<<< HEAD
-            >
-              {{ commit.shortSha }}
-            </a>
-=======
            >{{ commit.shortSha }}</a>
->>>>>>> upstream/master
            {{ s__('FirstPushedBy|pushed by') }}
            <a
              :href="commit.author.webUrl"