From 2e0c40ed459499467a9d770770d8fcc756b7d9db Mon Sep 17 00:00:00 2001
From: Zanz2 <zan.zagar@hotmail.com>
Date: Wed, 26 Sep 2018 12:20:13 +0200
Subject: [PATCH] fixed merge

---
 app/controllers/api/v1/activities_controller.rb | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/controllers/api/v1/activities_controller.rb b/app/controllers/api/v1/activities_controller.rb
index e3b9b34a1..793794c8d 100644
--- a/app/controllers/api/v1/activities_controller.rb
+++ b/app/controllers/api/v1/activities_controller.rb
@@ -26,7 +26,6 @@ module Api
         render jsonapi: @activity, serializer: ActivitySerializer
       end
 
-<<<<<<< HEAD
       def project_activities
         activities = @project.activities
                              .page(params.dig(:page, :number))
@@ -40,8 +39,6 @@ module Api
         render jsonapi: @project_activity, serializer: ActivitySerializer
       end
 
-=======
->>>>>>> 2a1c3037b8d19dd4ba3a7ae599fe0d7e6c5a2e24
       private
 
       def load_team
@@ -74,7 +71,6 @@ module Api
         )
         render jsonapi: {}, status: :not_found if @activity.nil?
       end
-<<<<<<< HEAD
 
       def load_project_activity
         @project_activity = @project.activities.find(
@@ -82,8 +78,6 @@ module Api
         )
         render jsonapi: {}, status: :not_found if @project_activity.nil?
       end
-=======
->>>>>>> 2a1c3037b8d19dd4ba3a7ae599fe0d7e6c5a2e24
     end
   end
 end