IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-03-01 12:44:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

solve forgotten merge conflict

Browse Source
This commit is contained in:
clauspeterhuebner 2025-11-26 23:07:32 +01:00
parent 1ead1bc4a8
commit aabc425b51
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
backend/src/graphql/resolver/TransactionResolver.ts
View File

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