From 9dcc965f734d7f4c16423a352f37a346eed9a347 Mon Sep 17 00:00:00 2001
From: Carlos Martins <cmartins@expensify.com>
Date: Wed, 6 Nov 2024 13:27:15 -0700
Subject: [PATCH] resolve conflits

---
 src/components/Search/types.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/components/Search/types.ts b/src/components/Search/types.ts
index 8b30a824a5e0..bd2c439287a9 100644
--- 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;