Skip to content

Fix conflict warning#945

Merged
AltGr merged 2 commits intomasterfrom
fix-conflict-warning
Jan 22, 2026
Merged

Fix conflict warning#945
AltGr merged 2 commits intomasterfrom
fix-conflict-warning

Conversation

@vincent-botbol
Copy link
Contributor

Fix faulty warning message that was reporting non-legitimate conflicts

@vincent-botbol vincent-botbol requested a review from AltGr January 22, 2026 15:05
Copy link
Contributor

@AltGr AltGr left a comment

Choose a reason for hiding this comment

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

Perfect

@AltGr AltGr merged commit 6ea3850 into master Jan 22, 2026
6 checks passed
@AltGr AltGr deleted the fix-conflict-warning branch January 22, 2026 15:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

2 participants