Resolve conflict in app/assets/javascripts/vue_shared/components/issue/issue_warning.vue

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Resolve conflict in app/assets/javascripts/vue_shared/components/issue/issue_warning.vue
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
a7e7469b · Dmitriy Zaporozhets · 6ee56e2b · a7e7469b
Commit a7e7469b authored Oct 10, 2017 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/vue_shared/components/issue/issue_warning.vue ...javascripts/vue_shared/components/issue/issue_warning.vue +0 -4

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
@@ -32,11 +32,7 @@
  <div class="issuable-note-warning">
    <i
      aria-hidden="true"
-<<<<<<< HEAD
-      class="fa"
-=======
      class="fa icon"
->>>>>>> ce-com/master
      :class="iconClass"
      v-if="!isLockedAndConfidential"
    ></i>