Skip to content

Commit 877781f

Browse files
committed
Fix one more conflict
1 parent b1d5847 commit 877781f

1 file changed

Lines changed: 0 additions & 4 deletions

File tree

src/components/MoneyRequestReportView/MoneyRequestReportTransactionList.tsx

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -283,11 +283,7 @@ function MoneyRequestReportTransactionList({
283283
<MoneyRequestReportTransactionItem
284284
key={transaction.transactionID}
285285
transaction={transaction}
286-
<<<<<<< HEAD
287-
columns={columnsToShow}
288286
report={report}
289-
=======
290-
>>>>>>> parent of 7ba0f03e8c2 (Merge pull request #63501 from Expensify/youssef_auto_show_hide_columns)
291287
isSelectionModeEnabled={isMobileSelectionModeEnabled}
292288
toggleTransaction={toggleTransaction}
293289
isSelected={isTransactionSelected(transaction.transactionID)}

0 commit comments

Comments
 (0)