From 47d967e4bf419aef01714e82e5638ee75157e195 Mon Sep 17 00:00:00 2001
From: LukasNowy <nowy492l@htl-ottakring.ac.at>
Date: Sun, 24 Mar 2019 20:10:12 +0100
Subject: [PATCH] fehler beoben

---
 express-server/db-connect/db-connect.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/express-server/db-connect/db-connect.js b/express-server/db-connect/db-connect.js
index 6d2f9677..94fefa06 100644
--- a/express-server/db-connect/db-connect.js
+++ b/express-server/db-connect/db-connect.js
@@ -657,10 +657,4 @@ module.exports = {
     removeMember,
     moveDoneItemMan,
     getUser,
-<<<<<<< HEAD
-    getUserDB,
-    deleteDonePurchase
-=======
-    realUpdateUser
->>>>>>> 3ab823a0258758dd48a687eaafed77ee36832b61
 }
\ No newline at end of file