From 64a78f2941ce9f06c46ca461c216ff22b429b447 Mon Sep 17 00:00:00 2001
From: Thomas Mack <email@bielefeldts.de>
Date: Sat, 28 Sep 2019 13:43:40 +0200
Subject: [PATCH] Fehler in Person behoben

---
 routes/v1/person.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/routes/v1/person.js b/routes/v1/person.js
index 521b7a7..e3505c0 100644
--- a/routes/v1/person.js
+++ b/routes/v1/person.js
@@ -34,12 +34,8 @@ router.get('/', function(req, res, next) {
       next(err);
     } else {
       let result  = {};
-<<<<<<< HEAD
-      result['items'] = rs.rows;
-=======
-      result['person'] = rs.rows;
->>>>>>> 0db45ce44687f68654bfe595345fd32498cbe665
-      console.log(result);
+			result['items'] = rs.rows;
+			console.log(result);
       res.status(200).json(result);
     }
   });