diff options
author | Fatih Acet <acetfatih@gmail.com> | 2018-07-04 17:19:48 +0200 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2018-07-04 17:19:48 +0200 |
commit | 2e6c64f2b2eea7a9933467a6018a819081a2f12a (patch) | |
tree | 03af4bc306c418554716df4bd3d4210d5b794a94 | |
parent | f91eaa9f4343866ed701a46a06d285174c53370d (diff) | |
download | gitlab-ce-2e6c64f2b2eea7a9933467a6018a819081a2f12a.tar.gz |
Fix conflicts on diff_table_cell.vue.
-rw-r--r-- | app/assets/javascripts/diffs/components/diff_table_cell.vue | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/app/assets/javascripts/diffs/components/diff_table_cell.vue b/app/assets/javascripts/diffs/components/diff_table_cell.vue index fd043102015..5b08b161114 100644 --- a/app/assets/javascripts/diffs/components/diff_table_cell.vue +++ b/app/assets/javascripts/diffs/components/diff_table_cell.vue @@ -11,11 +11,8 @@ import { LINE_HOVER_CLASS_NAME, LINE_UNFOLD_CLASS_NAME, INLINE_DIFF_VIEW_TYPE, -<<<<<<< HEAD LINE_POSITION_LEFT, LINE_POSITION_RIGHT, -======= ->>>>>>> eba05eb8d48... Merge branch '_acet-mr-diff-performance' into 'master' } from '../constants'; export default { @@ -70,7 +67,6 @@ export default { computed: { ...mapGetters(['isLoggedIn']), normalizedLine() { -<<<<<<< HEAD let normalizedLine; if (this.diffViewType === INLINE_DIFF_VIEW_TYPE) { @@ -79,10 +75,6 @@ export default { normalizedLine = this.line.left; } else if (this.linePosition === LINE_POSITION_RIGHT) { normalizedLine = this.line.right; -======= - if (this.diffViewType === INLINE_DIFF_VIEW_TYPE) { - return this.line; ->>>>>>> eba05eb8d48... Merge branch '_acet-mr-diff-performance' into 'master' } return normalizedLine; |