Resolve note_form

90944c7f · Luke Bennett · 238be2d4 · 90944c7f
Commit 90944c7f authored Jan 11, 2018 by Luke Bennett
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

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

No files found.
--- a/app/assets/javascripts/notes/components/note_form.vue
+++ b/app/assets/javascripts/notes/components/note_form.vue
@@ -116,12 +116,8 @@
 <template>
  <div
    ref="editNoteForm"
-<<<<<<< HEAD
    class="note-edit-form current-note-edit-form"
  >
-=======
-    class="note-edit-form current-note-edit-form">
->>>>>>> upstream/master
    <div
      v-if="conflictWhileEditing"
      class="js-conflict-edit-warning alert alert-danger">