fix: clean leftover merge conflict markers on dev #7203

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

Closed

zhuanggenhua wants to merge 3 commits into AstrBotDevs:dev from zhuanggenhua:fix/dev-merge-conflict-cleanup

Closed

fix: clean leftover merge conflict markers on dev #7203

Merge remote-tracking branch 'origin/dev' into fix/dev-merge-conflict…

Sourcery AI / Sourcery review succeeded Mar 31, 2026 in 5s

✅ Completed successfully

Sourcery completed the review and found no blocking security issues

View more details on Sourcery AI