Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mountiny committed Jul 5, 2024
1 parent 1bf7319 commit 16c2f53
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/libs/SearchUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,7 @@ function getReportSections(data: OnyxTypes.SearchResults['data'], metadata: Onyx

reportIDToTransactions[reportKey] = {
...value,
<<<<<<< HEAD
=======
keyForList: value.reportID,
from: data.personalDetailsList?.[value.accountID],
to: data.personalDetailsList?.[value.managerID],
>>>>>>> 87f5cdd7 (Merge pull request #44882 from nkdengineer/fix/44801)
transactions,
};
} else if (key.startsWith(ONYXKEYS.COLLECTION.TRANSACTION)) {
Expand Down

0 comments on commit 16c2f53

Please sign in to comment.