Resolve inline and parallel diff view component

app/assets/javascripts/diffs/components/inline_diff_view.vue

@@ -24,10 +24,7 @@ export default {
   },
   computed: {
     ...mapGetters('diffs', ['commitId']),
-<<<<<<< HEAD
     ...mapGetters('batchComments', ['shouldRenderDraftRow', 'draftForLine']),
-=======
->>>>>>> upstream/master
     diffLinesLength() {
       return this.diffLines.length;
     },
@@ -55,14 +52,11 @@ export default {
           :key="`icr-${index}`"
           :diff-file-hash="diffFile.file_hash"
           :line="line"
-<<<<<<< HEAD
         />
         <inline-draft-comment-row
           v-if="shouldRenderDraftRow(diffFile.file_hash, line)"
           :key="`draft_${index}`"
           :draft="draftForLine(diffFile.file_hash, line)"
-=======
->>>>>>> upstream/master
         />
       </template>
     </tbody>

app/assets/javascripts/diffs/components/parallel_diff_view.vue

@@ -24,10 +24,7 @@ export default {
   },
   computed: {
     ...mapGetters('diffs', ['commitId']),
-<<<<<<< HEAD
     ...mapGetters('batchComments', ['shouldRenderParallelDraftRow', 'draftForLine']),
-=======
->>>>>>> upstream/master
     diffLinesLength() {
       return this.diffLines.length;
     },