Resolving conflict

a673d25d · Francisco Javier López · f798169c · a673d25d
Commit a673d25d authored Dec 14, 2017 by Francisco Javier López
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

groups.rb lib/api/groups.rb +1 -4

No files found.
--- a/lib/api/groups.rb
+++ b/lib/api/groups.rb
@@ -64,10 +64,7 @@ module API
        groups = groups.where.not(id: params[:skip_groups]) if params[:skip_groups].present?
        groups = groups.reorder(params[:order_by] => params[:sort])

-<<<<<<< HEAD
-        present_groups groups, statistics: params[:statistics] && current_user.admin?
-=======
-        groups
+        present_groups params, groups
      end

      def find_group_projects(params)