Resolve app/finders/issues_finder.rb

69b538ba · Sean McGivern · 9b8dc8c6 · 69b538ba
Commit 69b538ba authored Jun 08, 2018 by Sean McGivern
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

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

No files found.
--- a/app/finders/issues_finder.rb
+++ b/app/finders/issues_finder.rb
@@ -144,7 +144,6 @@ class IssuesFinder < IssuableFinder
      items
    end
  end
-<<<<<<< HEAD

  def assignees
    return @assignees if defined?(@assignees)
@@ -158,6 +157,4 @@ class IssuesFinder < IssuableFinder
        []
      end
  end
-=======
->>>>>>> upstream/master
 end