Skip to content

G
gitlab-ce
Commit dfa2e9ad authored by LUKE BENNETT's avatar LUKE BENNETT
Browse files
Options

Resolve milestone_select.js conflicts

parent cd49472a
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/milestone_select.js
View file @ dfa2e9ad
...@@ -226,8 +226,5 @@ export default class MilestoneSelect { ...@@ -226,8 +226,5 @@ export default class MilestoneSelect {
}); });
} }
} }
<<<<<<< HEAD
window.MilestoneSelect = MilestoneSelect; window.MilestoneSelect = MilestoneSelect;
=======
>>>>>>> upstream/master
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