Conflicts: app/finders/issuable_finder.rb

9e435b73 · Bob Van Landuyt · a5afdebf · 9e435b73
Commit 9e435b73 authored Feb 23, 2018 by Bob Van Landuyt
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/finders/issuable_finder.rb app/finders/issuable_finder.rb +0 -4

No files found.
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -117,11 +117,7 @@ class IssuableFinder
    counts[:all] = counts.values.sum
-<<<<<<< HEAD
    counts.with_indifferent_access
-=======
-    counts
->>>>>>> upstream/master
  end
  def group