partners

app/controllers/managements_controller.rb

@@ -1174,17 +1174,7 @@ end
   def partners
     @menu_type = 6
     @sub_type = 3
-<<<<<<< HEAD
-    @partners = Partner.includes(:school)
-    @limit = 10
-    @page = params['page'] || 1
-    @partners_count = @partners.count
-
-    @total_pages = (@partners_count / 10.0).ceil
-    @partners = paginateHelper @partners, @limit
-=======
     @partners = Partner.includes(:school).order("created_at desc")
->>>>>>> 0aec53dda74a8e3e3ac8c0f2cd70e38a65bfecbe
   end
 
   def all_partners