Resolve app/services/search/group_service.rb

48d0723d · Robert Speicher · df598db2 · 48d0723d
Commit 48d0723d authored Sep 13, 2018 by Robert Speicher
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/services/search/group_service.rb app/services/search/group_service.rb +0 -3

No files found.
--- a/app/services/search/group_service.rb
+++ b/app/services/search/group_service.rb
@@ -19,7 +19,6 @@ module Search
      @projects = super.inside_path(group.full_path)
    end
    # rubocop: enable CodeReuse/ActiveRecord
-<<<<<<< HEAD
    # rubocop: disable CodeReuse/ActiveRecord
    def elastic_projects
@@ -30,7 +29,5 @@ module Search
    def elastic_global
      false
    end
-=======
->>>>>>> upstream/master
  end
 end