From aabc425b519fc5355b061805a8df621286e32de7 Mon Sep 17 00:00:00 2001
From: clauspeterhuebner <hr.softwarelab@t-online.de>
Date: Wed, 26 Nov 2025 23:07:32 +0100
Subject: [PATCH] solve forgotten merge conflict

---
 backend/src/graphql/resolver/TransactionResolver.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts
index b1e9df019..b53ce4e61 100644
--- a/backend/src/graphql/resolver/TransactionResolver.ts
+++ b/backend/src/graphql/resolver/TransactionResolver.ts
@@ -33,12 +33,7 @@ import { Context, getUser } from '@/server/context'
 import { communityUser } from '@/util/communityUser'
 import { calculateBalance } from '@/util/validate'
 import { virtualDecayTransaction, virtualLinkTransaction } from '@/util/virtualTransactions'
-<<<<<<< HEAD
-import { fullName } from 'core'
 // import { TRANSACTIONS_LOCK } from 'database'
-=======
-import { TRANSACTIONS_LOCK } from 'database'
->>>>>>> refs/remotes/origin/master
 
 import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const'
 import { getLastTransaction } from 'database'