[CE->EE] Resolve FE related conflicts[ci skip]

app/assets/stylesheets/pages/boards.scss

@@ -459,7 +459,6 @@
   margin: 5px;
 }
 
-<<<<<<< HEAD
 .boards-title-holder {
   padding: 25px 13px $gl-padding;
 
@@ -480,13 +479,10 @@
   border-top: 1px solid $border-color;
 }
 
-.page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar {
-=======
 .page-with-layout-nav.page-with-sub-nav .issue-boards-sidebar,
 .page-with-new-sidebar.page-with-sidebar .issue-boards-sidebar {
   position: absolute;
 
->>>>>>> d964816b9fe56679ffc0b331e701f7b24db5c6a9
   &.right-sidebar {
     top: 0;
     bottom: 0;

config/webpack.config.js

@@ -43,12 +43,9 @@ var config = {
     group:                './group.js',
     groups:               './groups/index.js',
     groups_list:          './groups_list.js',
-<<<<<<< HEAD
     issuable:             './issuable/issuable_bundle.js',
     issues:               './issues/issues_bundle.js',
-=======
     how_to_merge:         './how_to_merge.js',
->>>>>>> d964816b9fe56679ffc0b331e701f7b24db5c6a9
     issue_show:           './issue_show/index.js',
     integrations:         './integrations',
     job_details:          './jobs/job_details_bundle.js',