Resolve lib/gitlab/search/parsed_query.rb

60ab0f44 · Sean McGivern · 7aefec62 · 60ab0f44
Commit 60ab0f44 authored Jun 20, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

lib/gitlab/search/parsed_query.rb lib/gitlab/search/parsed_query.rb +0 -3

No files found.
--- a/lib/gitlab/search/parsed_query.rb
+++ b/lib/gitlab/search/parsed_query.rb
 module Gitlab
  module Search
    class ParsedQuery
-<<<<<<< HEAD
      prepend EE::Gitlab::Search::ParsedQuery
-=======
->>>>>>> upstream/master
      attr_reader :term, :filters
      def initialize(term, filters)