Revert "Resolve app/assets/javascripts/notes/components/noteable_discussion.vue"

This reverts commit dae7daa3.

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

@@ -6,7 +6,12 @@ import { truncateSha } from '~/lib/utils/text_utility';
 import { s__, __, sprintf } 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';
+=======
 import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue';
+>>>>>>> upstream/master
 import Flash from '../../flash';
 import { SYSTEM_NOTE } from '../constants';
 import userAvatarLink from '../../vue_shared/components/user_avatar/user_avatar_link.vue';
@@ -38,7 +43,11 @@ export default {
     placeholderNote,
     placeholderSystemNote,
     systemNote,
+<<<<<<< HEAD
+    DraftNote,
+=======
     TimelineEntryItem,
+>>>>>>> upstream/master
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -379,6 +388,21 @@ Please check your network connection and try again.`;
                       @handleDeleteNote="deleteNoteHandler"
                     />
                   </template>
+<<<<<<< HEAD
+                </ul>
+                <draft-note
+                  v-if="showDraft(discussion.reply_id)"
+                  :key="`draft_${discussion.id}`"
+                  :draft="draftForDiscussion(discussion.reply_id)"
+                />
+                <div
+                  v-else-if="!isRepliesCollapsed"
+                  :class="{ 'is-replying': isReplying }"
+                  class="discussion-reply-holder"
+                >
+                  <template v-if="!isReplying && canReply">
+                    <div class="discussion-with-resolve-btn">
+=======
                 </template>
                 <template v-else>
                   <component
@@ -408,6 +432,7 @@ Please check your network connection and try again.`;
                       Reply...
                     </button>
                     <div v-if="discussion.resolvable">
+>>>>>>> upstream/master
                       <button
                         type="button"
                         class="btn btn-default mr-sm-2"
@@ -443,6 +468,21 @@ Please check your network connection and try again.`;
                         </button>
                       </div>
                     </div>
+<<<<<<< HEAD
+                  </template>
+                  <note-form
+                    v-if="isReplying"
+                    ref="noteForm"
+                    :discussion="discussion"
+                    :is-editing="false"
+                    save-button-title="Comment"
+                    @handleFormUpdateAddToReview="addReplyToReview"
+                    @handleFormUpdate="saveReply"
+                    @cancelForm="cancelReplyForm"
+                  />
+                  <note-signed-out-widget v-if="!canReply" />
+                </div>
+=======
                   </div>
                 </template>
                 <note-form
@@ -455,6 +495,7 @@ Please check your network connection and try again.`;
                   @cancelForm="cancelReplyForm"
                 />
                 <note-signed-out-widget v-if="!canReply" />
+>>>>>>> upstream/master
               </div>
             </div>
           </component>