Resolve issue_warning

10e60ae8 · Luke Bennett · 1ef234e2 · 10e60ae8
Commit 10e60ae8 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/issue/issue_warning.vue ...javascripts/vue_shared/components/issue/issue_warning.vue +0 -3

No files found.
--- a/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
+++ b/app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
@@ -5,10 +5,7 @@
    components: {
      icon,
    },
-<<<<<<< HEAD

-=======
->>>>>>> upstream/master
    props: {
      isLocked: {
        type: Boolean,