Commit ca8f95c2 authored by Felipe Artur's avatar Felipe Artur

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

parent 1d21ca57
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment