Fix FE conflicts

1 files changed, 0 insertions, 23 deletions

diff --git a/app/assets/javascripts/users_select.js b/app/assets/javascripts/users_select.js
index 7828bf86f60..cd1484fa857 100644
--- a/app/assets/javascripts/users_select.js
+++ b/app/assets/javascripts/users_select.js
@@ -320,11 +320,6 @@ import eventHub from './sidebar/event_hub';
                 $value.css('display', '');
               }
             },
-<<<<<<< HEAD
-            vue: $dropdown.hasClass('js-issue-board-sidebar'),
-            clicked: function(user, $el, e) {
-              var isIssueIndex, isMRIndex, page, selected, isSelecting;
-=======
             multiSelect: $dropdown.hasClass('js-multiselect'),
             inputMeta: $dropdown.data('input-meta'),
             clicked: function(options) {
@@ -390,7 +385,6 @@ import eventHub from './sidebar/event_hub';
               }
 
               var isIssueIndex, isMRIndex, page, selected;
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
               page = $('body').data('page');
               isIssueIndex = page === 'projects:issues:index';
               isMRIndex = (page === page && page === 'projects:merge_requests:index');
@@ -411,24 +405,7 @@ import eventHub from './sidebar/event_hub';
                 return Issuable.filterResults($dropdown.closest('form'));
               } else if ($dropdown.hasClass('js-filter-submit')) {
                 return $dropdown.closest('form').submit();
-<<<<<<< HEAD
-              } else if ($dropdown.hasClass('js-issue-board-sidebar')) {
-                if (user.id && isSelecting) {
-                  gl.issueBoards.boardStoreIssueSet('assignee', new ListUser({
-                    id: user.id,
-                    username: user.username,
-                    name: user.name,
-                    avatar_url: user.avatar_url
-                  }));
-                } else {
-                  gl.issueBoards.boardStoreIssueDelete('assignee');
-                }
-
-                updateIssueBoardsIssue();
-              } else {
-=======
               } else if (!$dropdown.hasClass('js-multiselect')) {
->>>>>>> b0a2435... Merge branch 'multiple_assignees_review_upstream' into ee_master
                 selected = $dropdown.closest('.selectbox').find("input[name='" + ($dropdown.data('field-name')) + "']").val();
                 return assignTo(selected);
               }