Fix conflicts for app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js

20d0a6aa · Filipa Lacerda · 26d49749 · 20d0a6aa
Commit 20d0a6aa authored Jun 14, 2018 by Filipa Lacerda
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js ...ripts/merge_conflicts/components/inline_conflict_lines.js +0 -4

No files found.
--- a/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
+++ b/app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
@@ -8,11 +8,7 @@ import utilsMixin from '../mixins/line_conflict_utils';
  global.mergeConflicts = global.mergeConflicts || {};
  global.mergeConflicts.inlineConflictLines = Vue.extend({
-<<<<<<< HEAD
-    mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
-=======
    mixins: [utilsMixin, actionsMixin],
->>>>>>> upstream/master
    props: {
      file: {
        type: Object,