Resolve conflict in app/assets/javascripts/diff_notes/diff_notes_bundle.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in app/assets/javascripts/diff_notes/diff_notes_bundle.js
Signed-off-by: Rémy Coutable <remy@rymai.me>
ac3a05bf · Rémy Coutable · f79d81d1 · ac3a05bf
Commit ac3a05bf authored Feb 28, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/diff_notes/diff_notes_bundle.js app/assets/javascripts/diff_notes/diff_notes_bundle.js +0 -4

No files found.
--- a/app/assets/javascripts/diff_notes/diff_notes_bundle.js
+++ b/app/assets/javascripts/diff_notes/diff_notes_bundle.js
@@ -73,11 +73,7 @@ export default () => {
      el: '#resolve-count-app',
      components: {
        'resolve-count': ResolveCount
-<<<<<<< HEAD
-      }
-=======
      },
->>>>>>> upstream/master
    });
  }