Resolve conflicts for Issue boards assignees list

app/assets/javascripts/boards/models/list.js

@@ -55,12 +55,8 @@ class List {
       entityType = 'assignee_id';
     }
 
-<<<<<<< HEAD
     return gl.boardService
       .createList(entity.id, entityType)
-=======
-    return gl.boardService.createList(this.label.id)
->>>>>>> upstream/master
       .then(res => res.data)
       .then(data => {
         this.id = data.id;

app/assets/javascripts/boards/stores/boards_store.js

@@ -161,7 +161,6 @@ gl.issueBoards.BoardsStore = {
       return list[key] === val && byType;
     });
     return filteredList[0];
-<<<<<<< HEAD
   },
   updateFiltersUrl (replaceState = false) {
     if (replaceState) {
@@ -169,8 +168,6 @@ gl.issueBoards.BoardsStore = {
     } else {
       history.pushState(null, null, `?${this.filter.path}`);
     }
-=======
->>>>>>> upstream/master
   },
 };
 

app/views/shared/issuable/_search_bar.html.haml

@@ -122,14 +122,10 @@
             = icon('times')
         .filter-dropdown-container
           - if type == :boards
-<<<<<<< HEAD
             - user_can_admin_list = can?(current_user, :admin_list, board.parent)
 
             .js-board-config{ data: { can_admin_list: user_can_admin_list, has_scope: board.scoped? } }
             - if user_can_admin_list
-=======
-            - if can?(current_user, :admin_list, board.parent)
->>>>>>> upstream/master
               = render_if_exists 'shared/issuable/board_create_list_dropdown', board: board
               - if @project
                 #js-add-issues-btn.prepend-left-10{ data: { can_admin_list: can?(current_user, :admin_list, @project) } }