Commit 9e435b73 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Conflicts: app/finders/issuable_finder.rb

parent a5afdebf
...@@ -117,11 +117,7 @@ class IssuableFinder ...@@ -117,11 +117,7 @@ class IssuableFinder
counts[:all] = counts.values.sum counts[:all] = counts.values.sum
<<<<<<< HEAD
counts.with_indifferent_access counts.with_indifferent_access
=======
counts
>>>>>>> upstream/master
end end
def group def group
......
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