Resolve conflict in app/assets/javascripts/labels_select.js

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

Resolve conflict in app/assets/javascripts/labels_select.js
Signed-off-by: Rémy Coutable <remy@rymai.me>
1a93fbe6 · Rémy Coutable · 93c4552b · 1a93fbe6
Commit 1a93fbe6 authored Feb 22, 2018 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/labels_select.js app/assets/javascripts/labels_select.js +0 -4

No files found.
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -316,11 +316,7 @@ export default class LabelsSelect {
        },
        multiSelect: $dropdown.hasClass('js-multiselect'),
        vue: $dropdown.hasClass('js-issue-board-sidebar'),
-<<<<<<< HEAD
-        clicked: function(clickEvent) {
-=======
        clicked: function (clickEvent) {
->>>>>>> upstream/master
          const { $el, e, isMarking } = clickEvent;
          const label = clickEvent.selectedObj;