Fix JS spec conflicts

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

app/assets/javascripts/boards/components/modal/index.js

@@ -2,19 +2,12 @@
 
 import Vue from 'vue';
 import queryData from '../../utils/query_data';
-<<<<<<< HEAD
 import loadingIcon from '../../../vue_shared/components/loading_icon.vue';
 
-require('./header');
-require('./list');
-require('./footer');
-require('./empty_state');
-=======
 import './header';
 import './list';
 import './footer';
 import './empty_state';
->>>>>>> origin/master
 
 const ModalStore = gl.issueBoards.ModalStore;
 

spec/javascripts/blob/create_branch_dropdown_spec.js

-<<<<<<< HEAD
-require('~/gl_dropdown');
-require('~/blob/create_branch_dropdown');
-require('~/blob/target_branch_dropdown');
-=======
 import '~/gl_dropdown';
 import '~/lib/utils/type_utility';
 import '~/blob/create_branch_dropdown';
 import '~/blob/target_branch_dropdown';
->>>>>>> origin/master
 
 describe('CreateBranchDropdown', () => {
   const fixtureTemplate = 'static/target_branch_dropdown.html.raw';

spec/javascripts/blob/target_branch_dropdown_spec.js

-<<<<<<< HEAD
-require('~/gl_dropdown');
-require('~/blob/create_branch_dropdown');
-require('~/blob/target_branch_dropdown');
-=======
 import '~/gl_dropdown';
 import '~/lib/utils/type_utility';
 import '~/blob/create_branch_dropdown';
 import '~/blob/target_branch_dropdown';
->>>>>>> origin/master
 
 describe('TargetBranchDropdown', () => {
   const fixtureTemplate = 'static/target_branch_dropdown.html.raw';

spec/javascripts/gl_dropdown_spec.js

 /* eslint-disable comma-dangle, no-param-reassign, no-unused-expressions, max-len */
 
-<<<<<<< HEAD
-require('~/gl_dropdown');
-require('~/lib/utils/common_utils');
-require('~/lib/utils/url_utility');
-=======
 import '~/gl_dropdown';
 import '~/lib/utils/common_utils';
 import '~/lib/utils/type_utility';
 import '~/lib/utils/url_utility';
->>>>>>> origin/master
 
 (() => {
   const NON_SELECTABLE_CLASSES = '.divider, .separator, .dropdown-header, .dropdown-menu-empty-link';

spec/javascripts/labels_issue_sidebar_spec.js

@@ -2,16 +2,6 @@
 /* global IssuableContext */
 /* global LabelsSelect */
 
-<<<<<<< HEAD
-require('~/gl_dropdown');
-require('select2');
-require('vendor/jquery.nicescroll');
-require('~/api');
-require('~/create_label');
-require('~/issuable_context');
-require('~/users_select');
-require('~/labels_select');
-=======
 import '~/lib/utils/type_utility';
 import '~/gl_dropdown';
 import 'select2';
@@ -21,7 +11,6 @@ import '~/create_label';
 import '~/issuable_context';
 import '~/users_select';
 import '~/labels_select';
->>>>>>> origin/master
 
 (() => {
   let saveLabelCount = 0;

spec/javascripts/project_title_spec.js

 /* eslint-disable space-before-function-paren, no-unused-expressions, no-return-assign, no-param-reassign, no-var, new-cap, wrap-iife, no-unused-vars, quotes, jasmine/no-expect-in-setup-teardown, max-len */
 /* global Project */
 
-<<<<<<< HEAD
-require('select2/select2.js');
-require('~/gl_dropdown');
-require('~/api');
-require('~/project_select');
-require('~/project');
-=======
 import 'select2/select2';
 import '~/lib/utils/type_utility';
 import '~/gl_dropdown';
 import '~/api';
 import '~/project_select';
 import '~/project';
->>>>>>> origin/master
 
 (function() {
   describe('Project Title', function() {

spec/javascripts/search_autocomplete_spec.js

 /* eslint-disable space-before-function-paren, max-len, no-var, one-var, one-var-declaration-per-line, no-unused-expressions, consistent-return, no-param-reassign, default-case, no-return-assign, comma-dangle, object-shorthand, prefer-template, quotes, new-parens, vars-on-top, new-cap, max-len */
 
-<<<<<<< HEAD
-require('~/gl_dropdown');
-require('~/search_autocomplete');
-require('~/lib/utils/common_utils');
-require('vendor/fuzzaldrin-plus');
-=======
 import '~/gl_dropdown';
 import '~/search_autocomplete';
 import '~/lib/utils/common_utils';
 import '~/lib/utils/type_utility';
 import 'vendor/fuzzaldrin-plus';
->>>>>>> origin/master
 
 (function() {
   var addBodyAttributes, assertLinks, dashboardIssuesPath, dashboardMRsPath, groupIssuesPath, groupMRsPath, groupName, mockDashboardOptions, mockGroupOptions, mockProjectOptions, projectIssuesPath, projectMRsPath, projectName, userId, widget;