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.

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

俩个uuid库合并一个,更新库到当前版本。 #1990

Merged
merged 9 commits into from
Feb 11, 2025

Conversation

tesun
Copy link
Contributor

@tesun tesun commented Jan 22, 2025

No description provided.

@pixelmaxQm pixelmaxQm changed the base branch from main to dev-2.7.9 February 8, 2025 03:34
@pixelmaxQm
Copy link
Collaborator

pr和之前提交过的存在冲突,可以将代码同步到dev-2.7.9分支后再合并提价pr到2.7.9

@pixelmaxQm
Copy link
Collaborator

需要合并 dev-2.7.9分支代码才可以

@pixelmaxQm pixelmaxQm merged commit b4166d3 into flipped-aurora:dev-2.7.9 Feb 11, 2025
3 of 4 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