[CE->EE][ci skip] resolve frontend conflicts

CHANGELOG.md

@@ -100,11 +100,7 @@ entry.
 - [CHANGED] Added defaults for protected branches dropdowns on the repository settings. !14278
 - [CHANGED] Show confirmation modal before deleting account. !14360
 - [CHANGED] Allow creating merge requests across a fork network. !14422
-<<<<<<< HEAD
 - [CHANGED] Re-arrange <script> tags before <template> tags in .vue files. !14671
-=======
-- [CHANGED] Re-arrange script HTML tags before template HTML tags in .vue files. !14671
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
 - [CHANGED] Create idea of read-only database. !14688
 - [CHANGED] Add active states to nav bar counters.
 - [CHANGED] Add view replaced file link for image diffs.

app/assets/javascripts/dispatcher.js

@@ -91,16 +91,13 @@ import U2FAuthenticate from './u2f/authenticate';
 import Members from './members';
 import memberExpirationDate from './member_expiration_date';
 import DueDateSelectors from './due_date_select';
-<<<<<<< HEAD
+import Diff from './diff';
 
 // EE-only
 import ApproversSelect from './approvers_select';
 import AuditLogs from './audit_logs';
 import initGeoInfoModal from './init_geo_info_modal';
 import initGroupAnalytics from './init_group_analytics';
-=======
-import Diff from './diff';
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
 
 (function() {
   var Dispatcher;

app/assets/javascripts/issuable_form.js

 /* eslint-disable func-names, space-before-function-paren, no-var, prefer-rest-params, wrap-iife, no-use-before-define, no-useless-escape, no-new, quotes, object-shorthand, no-unused-vars, comma-dangle, no-alert, consistent-return, no-else-return, prefer-template, one-var, one-var-declaration-per-line, curly, max-len */
 /* global GitLab */
 /* global Autosave */
-<<<<<<< HEAD
 /* global GroupsSelect */
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
 
 import Pikaday from 'pikaday';
 import UsersSelect from './users_select';

app/assets/javascripts/main.js

@@ -50,11 +50,8 @@ import './compare_autocomplete';
 import './confirm_danger_modal';
 import './copy_as_gfm';
 import './copy_to_clipboard';
-<<<<<<< HEAD
 import './diff';
 import './files_comment_button';
-=======
->>>>>>> 82446a2bd009e7d7481c35a142063a3973be77ce
 import Flash, { removeFlashClickListener } from './flash';
 import './gl_dropdown';
 import './gl_field_error';