[CE->EE] Resolve *.js

app/assets/javascripts/dispatcher.js

@@ -31,12 +31,8 @@ import CILintEditor from './ci_lint_editor';
 import Labels from './labels';
 import LabelManager from './label_manager';
 /* global Sidebar */
-<<<<<<< HEAD
 /* global WeightSelect */
 /* global AdminEmailSelect */
-=======
-
->>>>>>> 3fa410c831dac1dd1a74a14260ed99a5920218f8
 import CommitsList from './commits';
 import Issue from './issue';
 import BindInOut from './behaviors/bind_in_out';
@@ -470,7 +466,6 @@ import initGroupAnalytics from './init_group_analytics';
           new TreeView();
           new BlobViewer();
           new NewCommitForm($('.js-create-dir-form'));
-<<<<<<< HEAD
 
           if (document.querySelector('.js-tree-content').dataset.pathLocksAvailable === 'true') {
             PathLocks.init(
@@ -479,8 +474,6 @@ import initGroupAnalytics from './init_group_analytics';
             );
           }
 
-=======
->>>>>>> 3fa410c831dac1dd1a74a14260ed99a5920218f8
           $('#tree-slider').waitForImages(function() {
             ajaxGet(document.querySelector('.js-tree-content').dataset.logsPath);
           });

app/assets/javascripts/main.js

@@ -340,16 +340,13 @@ $(function () {
     gl.utils.visitUrl(`${action}${$(this).serialize()}`);
   });
 
-<<<<<<< HEAD
   /**
    * EE specific scripts
    */
   $('#modal-upload-trial-license').modal('show');
-=======
   const flashContainer = document.querySelector('.flash-container');
 
   if (flashContainer && flashContainer.children.length) {
     removeFlashClickListener(flashContainer.children[0]);
   }
->>>>>>> 3fa410c831dac1dd1a74a14260ed99a5920218f8
 });