Resolve JS conflicts[ci skip]

.gitlab-ci.yml

@@ -212,17 +212,6 @@ rake brakeman: *exec
 rake flay: *exec
 license_finder: *exec
 rake downtime_check: *exec
-<<<<<<< HEAD
-=======
-rake ee_compat_check:
-  <<: *exec
-  only:
-    - branches
-  except:
-    - master
-    - tags
-  allow_failure: yes
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 
 rake db:migrate:reset:
   stage: test
@@ -336,15 +325,9 @@ trigger_docs:
   cache: {}
   artifacts: {}
   script:
-<<<<<<< HEAD
     - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ee https://gitlab.com/api/v3/projects/38069/trigger/builds"
   only:
     - master@gitlab-org/gitlab-ee
-=======
-    - "curl -X POST -F token=${DOCS_TRIGGER_TOKEN} -F ref=master -F variables[PROJECT]=ce https://gitlab.com/api/v3/projects/38069/trigger/builds"
-  only:
-    - master@gitlab-org/gitlab-ce
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 
 # Notify slack in the end
 

app/assets/javascripts/application.js

@@ -18,11 +18,8 @@
 /*= require jquery.atwho */
 /*= require jquery.scrollTo */
 /*= require jquery.turbolinks */
-<<<<<<< HEAD
 /*= require jquery.tablesorter */
-=======
 /*= require js.cookie */
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 /*= require turbolinks */
 /*= require autosave */
 /*= require bootstrap/affix */

app/assets/javascripts/boards/boards_bundle.js.es6

@@ -8,11 +8,8 @@
 //= require_tree ./mixins
 //= require_tree ./filters
 //= require ./components/board
-<<<<<<< HEAD
 //= require ./components/boards_selector
-=======
 //= require ./components/board_sidebar
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 //= require ./components/new_list_dropdown
 //= require ./vue_resource_interceptor
 
@@ -30,11 +27,8 @@ $(() => {
     el: $boardApp,
     components: {
       'board': gl.issueBoards.Board,
-<<<<<<< HEAD
-      'boards-selector': gl.issueBoards.BoardsSelector
-=======
+      'boards-selector': gl.issueBoards.BoardsSelector,
       'board-sidebar': gl.issueBoards.BoardSidebar
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
     },
     data: {
       state: Store.state,

app/assets/javascripts/boards/services/board_service.js.es6

 /* eslint-disable */
 class BoardService {
   constructor (root, boardId) {
-<<<<<<< HEAD
-    Vue.http.options.root = root;
-
     this.boards = Vue.resource(`${root}{/id}.json`);
-=======
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
     this.lists = Vue.resource(`${root}/${boardId}/lists{/id}`, {}, {
       generate: {
         method: 'POST',

app/assets/javascripts/protected_branches/protected_branch_dropdown.js.es6

-<<<<<<< HEAD
+/* eslint-disable */
 (global => {
   global.gl = global.gl || {};
-=======
-/* eslint-disable */
-class ProtectedBranchDropdown {
-  constructor(options) {
-    this.onSelect = options.onSelect;
-    this.$dropdown = options.$dropdown;
-    this.$dropdownContainer = this.$dropdown.parent();
-    this.$dropdownFooter = this.$dropdownContainer.find('.dropdown-footer');
-    this.$protectedBranch = this.$dropdownContainer.find('.create-new-protected-branch');
->>>>>>> 144358e98ee1b25b61854a3471e21e100ace9db5
 
   class ProtectedBranchDropdown {
     constructor(options) {