Resolve milestone_select.js conflicts

dfa2e9ad · LUKE BENNETT · cd49472a · dfa2e9ad
Commit dfa2e9ad authored Jan 04, 2018 by LUKE BENNETT
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/milestone_select.js app/assets/javascripts/milestone_select.js +0 -3

No files found.
--- a/app/assets/javascripts/milestone_select.js
+++ b/app/assets/javascripts/milestone_select.js
@@ -226,8 +226,5 @@ export default class MilestoneSelect {
    });
  }
 }
-<<<<<<< HEAD

 window.MilestoneSelect = MilestoneSelect;
-=======
->>>>>>> upstream/master