IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 01:46:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

adaptions after merge master

Browse Source
This commit is contained in:
Claus-Peter Huebner 2024-02-08 00:15:57 +01:00
parent 29a62dadd5
commit 491f4d2131
2 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
database/entity/Community.ts
View File

@ -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'

6
database/entity/User.ts
View File

@ -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'