resolve conflits

Expensify · Nov 6, 2024 · 9dcc965 · 9dcc965
1 parent a72db91
commit 9dcc965
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
@@ -33,7 +33,6 @@ type SelectedTransactionInfo = {
 /** Model of selected transactons */
 type SelectedTransactions = Record<string, SelectedTransactionInfo>;
 
-<<<<<<< HEAD
 /** Model of selected reports */
 type SelectedReports = {
     reportID: string;
@@ -42,8 +41,6 @@ type SelectedReports = {
     total: number;
 };
 
-=======
->>>>>>> cmartins-showButtons
 /** Model of payment data used by Search bulk actions */
 type PaymentData = {
     reportID: string;