Skip to content

G
gitlab-ce
Commit d2bb0c15 authored by Rémy Coutable's avatar Rémy Coutable
Browse files
Options

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

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent 4162398b
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/boards/models/issue.js
View file @ d2bb0c15
...@@ -23,7 +23,6 @@ class ListIssue { ...@@ -23,7 +23,6 @@ class ListIssue {
}; };
this.sidebarInfoEndpoint = obj.issue_sidebar_endpoint; this.sidebarInfoEndpoint = obj.issue_sidebar_endpoint;
this.toggleSubscriptionEndpoint = obj.toggle_subscription_endpoint; this.toggleSubscriptionEndpoint = obj.toggle_subscription_endpoint;
<<<<<<< HEAD
this.milestone_id = obj.milestone_id; this.milestone_id = obj.milestone_id;
this.project_id = obj.project_id; this.project_id = obj.project_id;
this.weight = obj.weight; this.weight = obj.weight;
...@@ -31,8 +30,6 @@ class ListIssue { ...@@ -31,8 +30,6 @@ class ListIssue {
if (obj.project) { if (obj.project) {
this.project = new IssueProject(obj.project); this.project = new IssueProject(obj.project);
} }
=======
>>>>>>> upstream/master
if (obj.milestone) { if (obj.milestone) {
this.milestone = new ListMilestone(obj.milestone); this.milestone = new ListMilestone(obj.milestone);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7