From c401088bc7a1e560023b7eb6ebfffb65d51c641c Mon Sep 17 00:00:00 2001
From: Phil Hughes <me@iamphill.com>
Date: Mon, 27 Feb 2017 12:36:43 +0000
Subject: [PATCH] Fixed JS conflicts

---
 .../javascripts/boards/models/list.js.es6     | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/app/assets/javascripts/boards/models/list.js.es6 b/app/assets/javascripts/boards/models/list.js.es6
index fa67d8ab27b..f237567208c 100644
--- a/app/assets/javascripts/boards/models/list.js.es6
+++ b/app/assets/javascripts/boards/models/list.js.es6
@@ -134,31 +134,24 @@ class List {
 
       if (listFrom) {
         this.issuesSize += 1;
-<<<<<<< HEAD
-        gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid)
-          .then(() => {
-            listFrom.getIssues(false);
-          });
-=======
-        this.updateIssueLabel(issue, listFrom);
->>>>>>> 82f6c0f5ac4ed29390ed90592d2c431f3494d93f
+
+        this.updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid);
       }
     }
   }
 
-<<<<<<< HEAD
   moveIssue (issue, oldIndex, newIndex, moveBeforeIid, moveAfterIid) {
     this.issues.splice(oldIndex, 1);
     this.issues.splice(newIndex, 0, issue);
 
     gl.boardService.moveIssue(issue.id, null, null, moveBeforeIid, moveAfterIid);
-=======
-  updateIssueLabel(issue, listFrom) {
-    gl.boardService.moveIssue(issue.id, listFrom.id, this.id)
+  }
+
+  updateIssueLabel(issue, listFrom, moveBeforeIid, moveAfterIid) {
+    gl.boardService.moveIssue(issue.id, listFrom.id, this.id, moveBeforeIid, moveAfterIid)
       .then(() => {
         listFrom.getIssues(false);
       });
->>>>>>> 82f6c0f5ac4ed29390ed90592d2c431f3494d93f
   }
 
   findIssue (id) {