From 491f4d2131259597beaeda8864db0126ac1d0894 Mon Sep 17 00:00:00 2001
From: Claus-Peter Huebner <claus-peter.huebner@email.de>
Date: Thu, 8 Feb 2024 00:15:57 +0100
Subject: [PATCH] adaptions after merge master

---
 database/entity/Community.ts | 6 +-----
 database/entity/User.ts      | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/database/entity/Community.ts b/database/entity/Community.ts
index 13fbbcf00..3b48d5c29 100644
--- a/database/entity/Community.ts
+++ b/database/entity/Community.ts
@@ -1,5 +1 @@
-<<<<<<< HEAD
-export { Community } from './0081-introduce_gms_registration/Community'
-=======
-export { Community } from './0081-user_join_community/Community'
->>>>>>> refs/remotes/origin/master
+export { Community } from './0082-introduce_gms_registration/Community'
diff --git a/database/entity/User.ts b/database/entity/User.ts
index 0cde9b36f..e3f15113d 100644
--- a/database/entity/User.ts
+++ b/database/entity/User.ts
@@ -1,5 +1 @@
-<<<<<<< HEAD
-export { User } from './0081-introduce_gms_registration/User'
-=======
-export { User } from './0081-user_join_community/User'
->>>>>>> refs/remotes/origin/master
+export { User } from './0082-introduce_gms_registration/User'