Resolve conflict in app/assets/javascripts/boards/models/issue.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

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

@@ -23,7 +23,6 @@ class ListIssue {
     };
     this.sidebarInfoEndpoint = obj.issue_sidebar_endpoint;
     this.toggleSubscriptionEndpoint = obj.toggle_subscription_endpoint;
-<<<<<<< HEAD
     this.milestone_id = obj.milestone_id;
     this.project_id = obj.project_id;
     this.weight = obj.weight;
@@ -31,8 +30,6 @@ class ListIssue {
     if (obj.project) {
       this.project = new IssueProject(obj.project);
     }
-=======
->>>>>>> upstream/master
 
     if (obj.milestone) {
       this.milestone = new ListMilestone(obj.milestone);