Skip to content

resolve conflict - #180

Merged
arhimede merged 8 commits into
developfrom
merge-main1
Aug 26, 2026
Merged

resolve conflict#180
arhimede merged 8 commits into
developfrom
merge-main1

Conversation

@bidi47

@bidi47 bidi47 commented Aug 26, 2026

Copy link
Copy Markdown
Member

No description provided.

@bidi47 bidi47 changed the title Merge main1 resolve conflict Aug 26, 2026
@bidi47
bidi47 requested a review from arhimede August 26, 2026 18:57
@arhimede
arhimede merged commit dc10a51 into develop Aug 26, 2026
26 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants