Resolving conflict with app/assets/javascripts/filtered_search/filtered_search_manager.js

3da2e3e8 · Ian Baum · ea659729 · 3da2e3e8
Commit 3da2e3e8 authored Feb 07, 2018 by Ian Baum
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/assets/javascripts/filtered_search/filtered_search_manager.js ...ts/javascripts/filtered_search/filtered_search_manager.js +0 -3

No files found.
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -30,12 +30,9 @@ class FilteredSearchManager {
      issues: 'issue-recent-searches',
      merge_requests: 'merge-request-recent-searches',
    };
-<<<<<<< HEAD

    // EE specific setup
    this.initEE();
-=======
->>>>>>> upstream/master

    this.recentSearchesStore = new RecentSearchesStore({
      isLocalStorageAvailable: RecentSearchesService.isAvailable(),