Resolving conflict with...

Resolving conflict with spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js

Resolving conflict with...
Resolving conflict with spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
6d16a164 · Ian Baum · 4cfc7d30 · 6d16a164
Commit 6d16a164 authored Feb 07, 2018 by Ian Baum
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js ...earch/components/recent_searches_dropdown_content_spec.js +0 -4

No files found.
--- a/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
+++ b/spec/javascripts/filtered_search/components/recent_searches_dropdown_content_spec.js
 import Vue from 'vue';
 import eventHub from '~/filtered_search/event_hub';
 import RecentSearchesDropdownContent from '~/filtered_search/components/recent_searches_dropdown_content';
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
 import FilteredSearchTokenKeys from '~/filtered_search/filtered_search_token_keys';

 const createComponent = (propsData) => {