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

Fix merge conflicts #223

Merged
merged 1 commit into from
May 22, 2023
Merged

Fix merge conflicts #223

merged 1 commit into from
May 22, 2023

Conversation

mrsabath
Copy link
Collaborator

Small fix to merge problems

@mrsabath
Fix merge conflicts
bb1b5ce 
Signed-off-by: Mariusz Sabath <mrsabath@gmail.com>
@mrsabath mrsabath requested a review from lumjjb as a code owner May 19, 2023 21:30
@mrsabath mrsabath added the bug Something isn't working label May 19, 2023
mamy-CS
mamy-CS approved these changes May 22, 2023
View reviewed changes
Copy link
Collaborator

@mamy-CS mamy-CS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@mrsabath mrsabath merged commit 0c40752 into v1.2 May 22, 2023
6 checks passed
@mrsabath mrsabath deleted the merge-fix branch May 22, 2023 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mamy-CS mamy-CS mamy-CS approved these changes

@lumjjb lumjjb Awaiting requested review from lumjjb lumjjb is a code owner

Assignees
No one assigned
Labels
bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mrsabath @mamy-CS