Fix conflicts on diff_table_cell.

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

@@ -10,12 +10,9 @@ import {
   NEW_NO_NEW_LINE_TYPE,
   LINE_HOVER_CLASS_NAME,
   LINE_UNFOLD_CLASS_NAME,
-<<<<<<< HEAD
-=======
   INLINE_DIFF_VIEW_TYPE,
   LINE_POSITION_LEFT,
   LINE_POSITION_RIGHT,
->>>>>>> 4c1a2a9b997... Merge branch '_acet-fix-parallel-diff-lines' into 'master'
 } from '../constants';
 
 export default {
@@ -65,10 +62,6 @@ export default {
   computed: {
     ...mapGetters(['isLoggedIn', 'isInlineView']),
     normalizedLine() {
-<<<<<<< HEAD
-      if (this.isInlineView) {
-        return this.line;
-=======
       let normalizedLine;
 
       if (this.diffViewType === INLINE_DIFF_VIEW_TYPE) {
@@ -77,7 +70,6 @@ export default {
         normalizedLine = this.line.left;
       } else if (this.linePosition === LINE_POSITION_RIGHT) {
         normalizedLine = this.line.right;
->>>>>>> 4c1a2a9b997... Merge branch '_acet-fix-parallel-diff-lines' into 'master'
       }
 
       return normalizedLine;