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

solve merge conflicts

Browse Source
This commit is contained in:
Claus-Peter Huebner 2024-02-09 23:32:42 +01:00
parent ae0887eb42
commit f70ff4d74b
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
database/entity/0082-introduce_gms_registration/User.ts
View File

@ -14,7 +14,6 @@ import { Contribution } from '../Contribution'
import { ContributionMessage } from '../ContributionMessage'
import { UserContact } from '../UserContact'
import { UserRole } from '../UserRole'
<<<<<<< HEAD
import { GeometryTransformer } from '../../src/typeorm/GeometryTransformer'
import { Community } from '../Community'