Resolve conflict in `app/assets/javascripts/boards/filtered_search_boards.js`

97bb3dc6 · Lukas Eipert · 76f2f70a · 97bb3dc6
Commit 97bb3dc6 authored Jun 21, 2018 by Lukas Eipert
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/boards/filtered_search_boards.js app/assets/javascripts/boards/filtered_search_boards.js +0 -3

No files found.
--- a/app/assets/javascripts/boards/filtered_search_boards.js
+++ b/app/assets/javascripts/boards/filtered_search_boards.js
-<<<<<<< HEAD
 import FilteredSearchTokenKeysIssues from 'ee/filtered_search/filtered_search_token_keys_issues';
-=======
->>>>>>> upstream/master
 import FilteredSearchContainer from '../filtered_search/container';
 import FilteredSearchManager from '../filtered_search/filtered_search_manager';