Resolve JS conflicts

app/assets/javascripts/boards/models/list.js

@@ -110,16 +110,13 @@ class List {
       .then((resp) => {
         const data = resp.json();
         issue.id = data.iid;
-<<<<<<< HEAD
         issue.milestone = data.milestone;
-=======
       })
       .then(() => {
         if (this.issuesSize > 1) {
           const moveBeforeIid = this.issues[1].id;
           gl.boardService.moveIssue(issue.id, null, null, null, moveBeforeIid);
         }
->>>>>>> ce/master
       });
   }
 

app/assets/javascripts/project_new.js

@@ -11,11 +11,8 @@ function highlightChanges($elm) {
       this.toggleSettings = this.toggleSettings.bind(this);
       this.$selects = $('.features select');
       this.$repoSelects = this.$selects.filter('.js-repo-select');
-<<<<<<< HEAD
       this.$enableApprovers = $('.js-require-approvals-toggle');
-=======
       this.$projectSelects = this.$selects.not('.js-repo-select');
->>>>>>> ce/master
 
       $('.project-edit-container').on('ajax:before', (function(_this) {
         return function() {