Commit 60ab0f44 authored by Sean McGivern's avatar Sean McGivern

Resolve lib/gitlab/search/parsed_query.rb

parent 7aefec62
module Gitlab module Gitlab
module Search module Search
class ParsedQuery class ParsedQuery
<<<<<<< HEAD
prepend EE::Gitlab::Search::ParsedQuery prepend EE::Gitlab::Search::ParsedQuery
=======
>>>>>>> upstream/master
attr_reader :term, :filters attr_reader :term, :filters
def initialize(term, filters) def initialize(term, filters)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment