Resolved conflicts in spec/javascripts/filtered_search/dropdown_user_spec.js

88647de1 · Constance Okoghenun · abb77e85 · 88647de1
Commit 88647de1 authored Feb 22, 2018 by Constance Okoghenun
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/javascripts/filtered_search/dropdown_user_spec.js spec/javascripts/filtered_search/dropdown_user_spec.js +0 -4

No files found.
--- a/spec/javascripts/filtered_search/dropdown_user_spec.js
+++ b/spec/javascripts/filtered_search/dropdown_user_spec.js
 import DropdownUtils from '~/filtered_search/dropdown_utils';
 import DropdownUser from '~/filtered_search/dropdown_user';
 import FilteredSearchTokenizer from '~/filtered_search/filtered_search_tokenizer';
-<<<<<<< HEAD
-
-=======
->>>>>>> upstream/master
 import FilteredSearchTokenKeys from '~/filtered_search/filtered_search_token_keys';

 describe('Dropdown User', () => {