Skip to content

Commit

Permalink
Resovle conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
mountiny committed Jul 18, 2024
1 parent 5fb3d25 commit 3af2245
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions src/components/PopoverMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,7 @@ function PopoverMenu({
onPress={() => {
setCurrentMenuItems(previousMenuItems);
setFocusedIndex(-1);
<<<<<<< HEAD
setEnteredSubMenuIndexes(enteredSubMenuIndexes.slice(0, -1));
=======
enteredSubMenuIndexes.splice(-1);
>>>>>>> 0560908 (Merge pull request #45674 from Expensify/vit-revert44724)
}}
/>
);
Expand Down

0 comments on commit 3af2245

Please sign in to comment.