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 #36550 to staging 🍒 #36554

Merged
merged 3 commits into from
Feb 15, 2024
Merged

🍒 Cherry pick PR #36550 to staging 🍒 #36554

merged 3 commits into from
Feb 15, 2024

Conversation

os-botify[bot]
Copy link

@os-botify os-botify bot commented Feb 15, 2024

🍒 Cherry pick #36550 to staging 🍒

OSBotify and others added 2 commits February 15, 2024 01:03
@OSBotify
Update version to 1.4.41-12
932e99d 
(cherry picked from commit bd69530)
@AndrewGable @OSBotify
Merge pull request #36550 from infinitered/trevor-coleman/violations/…
682e4f5 
…merchant-fix

fix(Violations): fix behaviour of merchant errors

(cherry picked from commit 68b9350)
@os-botify os-botify bot requested a review from a team as a code owner February 15, 2024 01:03
@os-botify
Copy link
Author

os-botify bot commented Feb 15, 2024

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 review from chiragsalian and removed request for a team February 15, 2024 01:03
@melvin-bot Melvin Bot
Copy link

melvin-bot bot commented Feb 15, 2024

@chiragsalian 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]

@AndrewGable AndrewGable merged commit 22f023f into staging Feb 15, 2024
4 of 6 checks passed
@AndrewGable AndrewGable deleted the AndrewGable-cherry-pick-staging-36550-1 branch February 15, 2024 01:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@thienlnam thienlnam thienlnam approved these changes

@chiragsalian chiragsalian Awaiting requested review from chiragsalian

Assignees

@AndrewGable AndrewGable

Labels
Engineering Hourly KSv2
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@thienlnam @AndrewGable @OSBotify