Resolve note_attachment

238be2d4 · Luke Bennett · fa5ff2cc · 238be2d4
Commit 238be2d4 authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/notes/components/note_attachment.vue app/assets/javascripts/notes/components/note_attachment.vue +0 -4

No files found.
--- a/app/assets/javascripts/notes/components/note_attachment.vue
+++ b/app/assets/javascripts/notes/components/note_attachment.vue
@@ -30,12 +30,8 @@
        rel="noopener noreferrer">
        <i
          class="fa fa-paperclip"
-<<<<<<< HEAD
          aria-hidden="true"
        >
-=======
-          aria-hidden="true">
->>>>>>> upstream/master
        </i>
        {{ attachment.filename }}
      </a>