From be9b351487c77593a589cfb2b832d7e4371008ca Mon Sep 17 00:00:00 2001
From: Mischa Spelt <mischa.spelt@nhgooi.nl>
Date: Sun, 3 May 2020 16:45:21 +0200
Subject: [PATCH] Merge conflict gefixt

---
 api/app/Http/Controllers/NewsController.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/api/app/Http/Controllers/NewsController.php b/api/app/Http/Controllers/NewsController.php
index 1af4c35..83f86d6 100644
--- a/api/app/Http/Controllers/NewsController.php
+++ b/api/app/Http/Controllers/NewsController.php
@@ -51,20 +51,6 @@ QUERY;
         return response($view)->header('Content-Type', 'application/xml');
     }
 
-    /**
-    * RSS-feed van alle podcasts
-    */
-    public function rss(Request $request) {
-        $page = (int)$request->get('page', 1);
-        if($page <= 0) {
-          return abort(400);
-        }
- 
-        $podcasts = $this->retrieveNewsItems($page, $count = 20, $filter = null, $params = []);
-        $view = view('rss.news')->with('news', $podcasts)->with('url', $request->url())->with('page', $page);
-        return response($view)->header('Content-Type', 'application/xml');
-    }
-
     /**
     * Lijst van alle nieuwsberichten
     */