CE->EE conflict resolvation[ci skip]

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

@@ -25,14 +25,11 @@ gl.issueBoards.BoardsStore = {
     this.state.lists = [];
     this.filter.path = getUrlParamsArray().join('&');
     this.detail = { issue: {} };
-<<<<<<< HEAD
   },
   createNewListDropdownData() {
     this.state.currentBoard = {};
     this.state.currentPage = '';
     this.state.reload = false;
-=======
->>>>>>> bfb5107ae720232a15060ee55feba213ee7dd097
   },
   addList (listObj, defaultAvatar) {
     const list = new List(listObj, defaultAvatar);

app/assets/javascripts/init_issuable_sidebar.js

 /* eslint-disable no-new */
 /* global MilestoneSelect */
 /* global LabelsSelect */
-<<<<<<< HEAD
 /* global WeightSelect */
-=======
->>>>>>> bfb5107ae720232a15060ee55feba213ee7dd097
 import IssuableContext from './issuable_context';
 /* global Sidebar */
 

app/assets/javascripts/issuable_form.js

@@ -20,10 +20,7 @@ export default class IssuableForm {
 
     new GfmAutoComplete(gl.GfmAutoComplete && gl.GfmAutoComplete.dataSources).setup();
     new UsersSelect();
-<<<<<<< HEAD
     groupsSelect();
-=======
->>>>>>> bfb5107ae720232a15060ee55feba213ee7dd097
     new ZenMode();
 
     this.titleField = this.form.find('input[name*="[title]"]');

app/assets/javascripts/milestone_select.js

@@ -148,7 +148,6 @@ import _ from 'underscore';
             $(`[data-milestone-id="${selectedMilestone}"] > a`, $el).addClass('is-active');
           },
           vue: $dropdown.hasClass('js-issue-board-sidebar'),
-<<<<<<< HEAD
           hideRow: function(milestone) {
             if ($('html').hasClass('issue-boards-page') && !$dropdown.hasClass('js-issue-board-sidebar') &&
               !$dropdown.closest('.add-issues-modal').length && gl.issueBoards.BoardsStore.state.currentBoard.milestone) {
@@ -165,8 +164,6 @@ import _ from 'underscore';
 
             return true;
           },
-=======
->>>>>>> bfb5107ae720232a15060ee55feba213ee7dd097
           clicked: function(options) {
             const { $el, e } = options;
             let selected = options.selectedObj;