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 #17348 to staging 🍒 #18999

Closed
wants to merge 2 commits into from
Closed

🍒 Cherry pick PR #17348 to staging 🍒 #18999

wants to merge 2 commits into from

Conversation

OSBotify
Copy link
Contributor

🍒 Cherry pick #17348 to staging 🍒

OSBotify and others added 2 commits May 16, 2023 10:00
@OSBotify
Merge pull request #18998 from Expensify/version-BUILD-C0C360C1-DF63-…
57b855d 
…42C3-A9B0-4862AD99A2FE

Update version to 1.3.14-7 on main

(cherry picked from commit a2c613b)
@MariaHCD @OSBotify
Merge pull request #17348 from Expensify/cmartins-allowDeletion
91d7724 
Allow money request deletion

(cherry picked from commit 3119b61)
@OSBotify OSBotify requested a review from a team as a code owner May 16, 2023 10:00
@melvin-bot melvin-bot bot removed the request for review from a team May 16, 2023 10:00
@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.

@mountiny
Copy link
Contributor

Ok this is hard to resolve because we there was another PR for tasks merged too and I dont want to mess this up so lets wait for next deploy. The TaskAction does not exist on staging yet

@mountiny mountiny closed this May 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@MariaHCD MariaHCD

Labels
automerge Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@OSBotify @mountiny @MariaHCD