From 3f96b76e8330f735e193c093f64983b8e863341a Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Mon, 29 Jan 2024 12:45:03 +0000 Subject: [PATCH] Resolve merge conflict --- src/libs/actions/Report.ts | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/libs/actions/Report.ts b/src/libs/actions/Report.ts index e60076613ca5..228b88d194ba 100644 --- a/src/libs/actions/Report.ts +++ b/src/libs/actions/Report.ts @@ -957,16 +957,7 @@ function readNewestAction(reportID: string) { lastReadTime, }; -<<<<<<< HEAD API.write('ReadNewestAction', parameters, {optimisticData}); - - if (!shouldEmitEvent) { - return; - } - -======= - API.write(WRITE_COMMANDS.READ_NEWEST_ACTION, parameters, {optimisticData}); ->>>>>>> b2e1e21 (Merge pull request #35308 from Expensify/vit-revert34537) DeviceEventEmitter.emit(`readNewestAction_${reportID}`, lastReadTime); }