Skip to content

G
gitlab-ce
Commit 01bfddc5 authored by Luke Bennett's avatar Luke Bennett
Browse files
Options

Resolve noteable_note

parent 90944c7f
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
app/assets/javascripts/notes/components/noteable_note.vue
View file @ 01bfddc5
...@@ -51,10 +51,7 @@ ...@@ -51,10 +51,7 @@
return `note_${this.note.id}`; return `note_${this.note.id}`;
}, },
}, },
<<<<<<< HEAD
=======
>>>>>>> upstream/master
created() { created() {
eventHub.$on('enterEditMode', ({ noteId }) => { eventHub.$on('enterEditMode', ({ noteId }) => {
if (noteId === this.note.id) { if (noteId === this.note.id) {
...@@ -63,10 +60,7 @@ ...@@ -63,10 +60,7 @@
} }
}); });
}, },
<<<<<<< HEAD
=======
>>>>>>> upstream/master
methods: { methods: {
...mapActions([ ...mapActions([
'deleteNote', 'deleteNote',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7