Resolve conflicts in app/assets/javascripts/boards/stores/boards_store.js

3290c83b · Stan Hu · 2d929fad · 3290c83b
Commit 3290c83b authored Oct 10, 2018 by Stan Hu
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/boards/stores/boards_store.js app/assets/javascripts/boards/stores/boards_store.js +0 -3

No files found.
--- a/app/assets/javascripts/boards/stores/boards_store.js
+++ b/app/assets/javascripts/boards/stores/boards_store.js
@@ -184,11 +184,8 @@ const boardsStore = {
  }
 };

-<<<<<<< HEAD
 BoardsStoreEE.initEESpecific(boardsStore);

-=======
->>>>>>> upstream/master
 // hacks added in order to allow milestone_select to function properly
 // TODO: remove these