Resolve ci_icon

b95b947a · Luke Bennett · ed4f0c0a · b95b947a
Commit b95b947a authored Jan 11, 2018 by Luke Bennett
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
@@ -27,10 +27,7 @@
    components: {
      icon,
    },
-<<<<<<< HEAD

-=======
->>>>>>> upstream/master
    props: {
      status: {
        type: Object,