Skip to content

Commit

Permalink
Resolve merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mountiny committed Jan 29, 2024
1 parent 6fc4a5e commit 3f96b76
Showing 1 changed file with 0 additions and 9 deletions.
9 changes: 0 additions & 9 deletions src/libs/actions/Report.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down

0 comments on commit 3f96b76

Please sign in to comment.