Resolve action_component

c42c4d2e · Luke Bennett · 8ca82922 · c42c4d2e
Commit c42c4d2e authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/pipelines/components/graph/action_component.vue ...vascripts/pipelines/components/graph/action_component.vue +0 -3

No files found.
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@@ -14,10 +14,7 @@
    directives: {
      tooltip,
    },
-<<<<<<< HEAD
-=======

->>>>>>> upstream/master
    props: {
      tooltipText: {
        type: String,