Resolve JS conflicts

app/assets/javascripts/boards/components/board_new_issue.js

@@ -29,18 +29,14 @@ export default {
         assignees: [],
       });
 
-<<<<<<< HEAD
       if (Store.state.currentBoard) {
         issue.milestone_id = Store.state.currentBoard.milestone_id;
       }
 
-      this.list.newIssue(issue)
-=======
       eventHub.$emit(`scroll-board-list-${this.list.id}`);
       this.cancel();
 
       return this.list.newIssue(issue)
->>>>>>> ce/master
         .then(() => {
           // Need this because our jQuery very kindly disables buttons on ALL form submissions
           $(this.$refs.submitButton).enable();

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

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