Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

🍒 Cherry pick PR #22662 to staging 🍒 #22722

Closed
wants to merge 2 commits into from
Closed

🍒 Cherry pick PR #22662 to staging 🍒 #22722

wants to merge 2 commits into from

Conversation

OSBotify
Copy link
Contributor

🍒 Cherry pick #22662 to staging 🍒

@OSBotify OSBotify requested a review from a team as a code owner July 11, 2023 22:21
@melvin-bot melvin-bot bot removed the request for review from a team July 11, 2023 22:21
@OSBotify
Copy link
Contributor Author

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@melvin-bot melvin-bot bot requested a review from Gonals July 11, 2023 22:22
@melvin-bot
Copy link

melvin-bot bot commented Jul 11, 2023

@Gonals Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@francoisl
Copy link
Contributor

Troubleshooting the conflicts in https://expensify.slack.com/archives/C03V9A4TB/p1689112204096699

@francoisl francoisl closed this Jul 11, 2023
@francoisl francoisl deleted the francoisl-cherry-pick-staging-22662-1 branch July 11, 2023 22:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Gonals Gonals Awaiting requested review from Gonals

Assignees

@francoisl francoisl

Labels
Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@OSBotify @francoisl