Resolve noteable_note

01bfddc5 · Luke Bennett · 90944c7f · 01bfddc5
Commit 01bfddc5 authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/assets/javascripts/notes/components/noteable_note.vue app/assets/javascripts/notes/components/noteable_note.vue +0 -6

No files found.
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -51,10 +51,7 @@
        return `note_${this.note.id}`;
      },
    },
-<<<<<<< HEAD
-=======

->>>>>>> upstream/master
    created() {
      eventHub.$on('enterEditMode', ({ noteId }) => {
        if (noteId === this.note.id) {
@@ -63,10 +60,7 @@
        }
      });
    },
-<<<<<<< HEAD
-=======

->>>>>>> upstream/master
    methods: {
      ...mapActions([
        'deleteNote',