Skip to content

Commit 5254662

Browse files
committed
chore: Remove merge conlifct artifaxt
1 parent be2c3d5 commit 5254662

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

apps/api/src/stripe/stripe.module.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,7 @@ import { TemplateService } from '../email/template.service'
2323
CampaignModule,
2424
PersonModule,
2525
DonationsModule,
26-
<<<<<<< HEAD
2726
forwardRef(() => RecurringDonationModule),
28-
=======
29-
forwardRef(()=>RecurringDonationModule),
30-
>>>>>>> 0184ab60de51db2219ae6714cb44a7211607fd2e
3127
],
3228
providers: [StripeService, StripePaymentService, EmailService, TemplateService],
3329
controllers: [StripeController],

0 commit comments

Comments
 (0)