IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge conflicts

Browse Source
This commit is contained in:
Ulf Gebhardt 2023-03-31 12:08:55 +02:00
parent 959487c3bb
commit 05fc48198e
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts
View File

@ -1,10 +1,8 @@
import { Contribution as DbContribution } from '@entity/Contribution' import { Contribution as DbContribution } from '@entity/Contribution'
import { Event as DbEvent } from '@entity/Event' import { Event as DbEvent } from '@entity/Event'
import { User as DbUser } from '@entity/User' import { User as DbUser } from '@entity/User'
import { Decimal } from 'decimal.js-light' import { Decimal } from 'decimal.js-light'
import { Event } from './Event' import { Event } from './Event'
import { EventType } from './EventType' import { EventType } from './EventType'

2
backend/src/graphql/resolver/ContributionLinkResolver.test.ts
View File

@ -12,7 +12,7 @@ import { GraphQLError } from 'graphql'
import { cleanDB, testEnvironment, resetToken } from '@test/helpers' import { cleanDB, testEnvironment, resetToken } from '@test/helpers'
import { logger } from '@test/testSetup' import { logger } from '@test/testSetup'
import { EventType } from '@/event/Event' import { EventType } from '@/event/Events'
import { userFactory } from '@/seeds/factory/user' import { userFactory } from '@/seeds/factory/user'
import { import {
login, login,

2
backend/src/graphql/resolver/TransactionLinkResolver.test.ts
View File

@ -18,7 +18,7 @@ import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers' import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers'
import { logger } from '@test/testSetup' import { logger } from '@test/testSetup'
import { EventType } from '@/event/Event' import { EventType } from '@/event/Events'
import { creations } from '@/seeds/creation/index' import { creations } from '@/seeds/creation/index'
import { creationFactory } from '@/seeds/factory/creation' import { creationFactory } from '@/seeds/factory/creation'
import { transactionLinkFactory } from '@/seeds/factory/transactionLink' import { transactionLinkFactory } from '@/seeds/factory/transactionLink'