[ci skip] Fix conflict for...

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

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

Showing with 0 additions and 4 deletions

app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue ...ts/cycle_analytics/components/stage_staging_component.vue +0 -4

No files found.
--- a/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
+++ b/app/assets/javascripts/cycle_analytics/components/stage_staging_component.vue
@@ -63,12 +63,8 @@
            </a>
            <span
              class="icon-branch"
-<<<<<<< HEAD
-              v-html="iconBranch">
-=======
              v-html="iconBranch"
            >
->>>>>>> upstream/master
            </span>
            <a
              :href="build.commitUrl"