removed conflicts

src/lib/api.ts

@@ -177,10 +177,7 @@ export async function createOrUpdateRecurringTransaction(
 export async function createExpense(
   expenseFormValues: ExpenseFormValues,
   groupId: string,
-<<<<<<< HEAD
   expenseRef: string|null = null,
-=======
->>>>>>> 5dfe03b3f11e16e16355e65ef092da77715b4bd1
   participantId?: string,
 ): Promise<Expense> {
   const group = await getGroup(groupId)
@@ -207,16 +204,12 @@ export async function createExpense(
     data: expenseFormValues.title,
   })
 
-<<<<<<< HEAD
-=======
-  const expenseId = randomId()
   await logActivity(groupId, ActivityType.CREATE_EXPENSE, {
     participantId,
     expenseId,
     data: expenseFormValues.title,
   })
 
->>>>>>> 5dfe03b3f11e16e16355e65ef092da77715b4bd1
   return prisma.expense.create({
     data: {
       id: expenseId,
@@ -264,7 +257,6 @@ export async function deleteExpense(
     data: existingExpense?.title,
   })
 
-<<<<<<< HEAD
   const lockId = randomId()
   const recurringTxns = await prisma.recurringTransactions.findMany({
     where: {groupId, expenseId}
@@ -276,8 +268,6 @@ export async function deleteExpense(
     })
   }
   await releaseLockRecurringTransaction(groupId, expenseId, lockId)
-=======
->>>>>>> 5dfe03b3f11e16e16355e65ef092da77715b4bd1
   await prisma.expense.delete({
     where: { id: expenseId, groupId },
     include: { paidFor: true, paidBy: true },
@@ -334,10 +324,7 @@ export async function updateExpense(
     expenseId,
     data: expenseFormValues.title,
   })
-<<<<<<< HEAD
-=======
 
->>>>>>> 5dfe03b3f11e16e16355e65ef092da77715b4bd1
   return prisma.expense.update({
     where: { id: expenseId },
     data: {
@@ -517,12 +504,6 @@ export async function getGroupExpenses(groupId: string, options?: { offset: numb
     })
   }
 
-=======
-export async function getGroupExpenses(
-  groupId: string,
-  options?: { offset: number; length: number },
-) {
->>>>>>> 5dfe03b3f11e16e16355e65ef092da77715b4bd1
   return prisma.expense.findMany({
     select: {
       amount: true,