Resolve conflicts in app/assets/javascripts/notes/components/noteable_discussion.vue

app/assets/javascripts/notes/components/noteable_discussion.vue

@@ -5,11 +5,8 @@ import { truncateSha } from '~/lib/utils/text_utility';
 import { s__ } from '~/locale';
 import systemNote from '~/vue_shared/components/notes/system_note.vue';
 import icon from '~/vue_shared/components/icon.vue';
-<<<<<<< HEAD
 import batchCommentsDiffLineNoteFormMixin from 'ee/batch_comments/mixins/diff_line_note_form';
 import DraftNote from 'ee/batch_comments/components/draft_note.vue';
-=======
->>>>>>> upstream/master
 import Flash from '../../flash';
 import { SYSTEM_NOTE } from '../constants';
 import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
@@ -443,11 +440,7 @@ Please check your network connection and try again.`;
                   :draft="draftForDiscussion(discussion.reply_id)"
                 />
                 <div
-<<<<<<< HEAD
                   v-else-if="!isRepliesCollapsed"
-=======
-                  v-if="!isRepliesCollapsed"
->>>>>>> upstream/master
                   :class="{ 'is-replying': isReplying }"
                   class="discussion-reply-holder"
                 >