From f70ff4d74bccd7cdcb753e728a16d8e740cd5072 Mon Sep 17 00:00:00 2001
From: Claus-Peter Huebner <claus-peter.huebner@email.de>
Date: Fri, 9 Feb 2024 23:32:42 +0100
Subject: [PATCH] solve merge conflicts

---
 database/entity/0082-introduce_gms_registration/User.ts | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/entity/0082-introduce_gms_registration/User.ts b/database/entity/0082-introduce_gms_registration/User.ts
index 46c7898a5..3dc0dccb6 100644
--- a/database/entity/0082-introduce_gms_registration/User.ts
+++ b/database/entity/0082-introduce_gms_registration/User.ts
@@ -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'