fehler beoben

2019-03-24 20:10:12 +01:00 · 2019-03-24 20:10:12 +01:00 · 47d967e4bf
commit 47d967e4bf
parent 5fc5551488
1 changed files with 0 additions and 6 deletions
--- 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
 }