Resolve conflict in app/assets/javascripts/notes.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/notes.js

@@ -768,11 +768,7 @@ export default class Notes {
   }
 
   removeNoteEditForm($note) {
-<<<<<<< HEAD
-    var form = $note.find('.current-note-edit-form');
-=======
     var form = $note.find('.diffs .current-note-edit-form');
->>>>>>> upstream/master
 
     $note.removeClass('is-editing');
     form.removeClass('current-note-edit-form');