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

resolve merge conflict for ContributionResolver.ts

Browse Source
This commit is contained in:
ogerly 2022-07-13 09:02:53 +02:00
parent 4dffa377cc
commit ee886f42e5
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/src/graphql/resolver/ContributionResolver.ts
View File

@ -3,6 +3,7 @@ import { Context, getUser } from '@/server/context'
import { backendLogger as logger } from '@/server/logger'
import { Contribution as dbContribution } from '@entity/Contribution'
import { Arg, Args, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql'
<<<<<<< HEAD
import { FindOperator, IsNull } from '@dbTools/typeorm'
import ContributionArgs from '@arg/ContributionArgs'
import Paginated from '@arg/Paginated'
@ -10,6 +11,15 @@ import { Order } from '@enum/Order'
import { Contribution } from '@model/Contribution'
import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
import { User } from '@model/User'
=======
import { IsNull, Not } from '../../../../database/node_modules/typeorm'
import ContributionArgs from '../arg/ContributionArgs'
import Paginated from '../arg/Paginated'
import { Order } from '../enum/Order'
import { Contribution } from '../model/Contribution'
import { UnconfirmedContribution } from '../model/UnconfirmedContribution'
import { User } from '../model/User'
>>>>>>> 193c7927e (resolve conflict)
import { validateContribution, getUserCreation } from './util/creations'
@Resolver()