remove merge text

ITPNYU · Oct 28, 2024 · d8e8458 · d8e8458
1 parent 1bb4ff2
commit d8e8458
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/booking-app/app/api/bookings/route.ts b/booking-app/app/api/bookings/route.ts
@@ -259,8 +259,6 @@ export async function PUT(request: NextRequest) {
     updatedData,
   );
 
-<<<<<<< HEAD
-=======
   await serverDeleteFieldsByCalendarEventId(
     TableNames.BOOKING,
     newCalendarEventId,
@@ -272,7 +270,6 @@ export async function PUT(request: NextRequest) {
     ],
   );
 
->>>>>>> staging
   // handle auto-approval + send emails
   await handleBookingApprovalEmails(
     isAutoApproval,