Fix conflict: app/assets/javascripts/boards/models/list.js

ca8f95c2 · Felipe Artur · 1d21ca57 · ca8f95c2
Commit ca8f95c2 authored Apr 20, 2018 by Felipe Artur
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/boards/models/list.js app/assets/javascripts/boards/models/list.js +0 -3

No files found.
--- a/app/assets/javascripts/boards/models/list.js
+++ b/app/assets/javascripts/boards/models/list.js
@@ -114,11 +114,8 @@ class List {
        issue.iid = data.iid;
        issue.milestone = data.milestone;
        issue.project = data.project;
-<<<<<<< HEAD
        issue.assignees = data.assignees;
        issue.labels = data.labels;
-=======
->>>>>>> upstream/master
        issue.path = data.real_path;
        issue.referencePath = data.reference_path;