Resolve conflicts in app/finders/merge_requests_finder.rb

03247eae · Stan Hu · cbf9b7ce · 03247eae
Commit 03247eae authored Mar 01, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

app/finders/merge_requests_finder.rb app/finders/merge_requests_finder.rb +0 -3

No files found.
--- a/app/finders/merge_requests_finder.rb
+++ b/app/finders/merge_requests_finder.rb
@@ -33,7 +33,6 @@ class MergeRequestsFinder < IssuableFinder

  private

-<<<<<<< HEAD
  def by_assignee(items)
    if assignee
      items = items.where(assignee_id: assignee.id)
@@ -46,8 +45,6 @@ class MergeRequestsFinder < IssuableFinder
    items
  end

-=======
->>>>>>> upstream/master
  def source_branch
    @source_branch ||= params[:source_branch].presence
  end