Resolve conflicts for app/assets/javascripts/vue_shared/components/ci_icon.vue

cf11a9e7 · Filipa Lacerda · 98d5506a · cf11a9e7
Commit cf11a9e7 authored Apr 23, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/vue_shared/components/ci_icon.vue app/assets/javascripts/vue_shared/components/ci_icon.vue +0 -3

No files found.
--- a/app/assets/javascripts/vue_shared/components/ci_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/ci_icon.vue
@@ -21,10 +21,7 @@ import Icon from '../../vue_shared/components/icon.vue';
 * - Jobs table
 * - Jobs show view header
 * - Jobs show view sidebar
-<<<<<<< HEAD
 * - Linked pipelines
-=======
->>>>>>> upstream/master
 */
 export default {
  components: {