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

resolve merge conflict? #2

Closed
suzp1984 opened this issue Nov 15, 2022 · 1 comment
Closed

resolve merge conflict? #2

suzp1984 opened this issue Nov 15, 2022 · 1 comment

Comments

@suzp1984
Copy link
Contributor

>>>>>>> 5a573801f1d86782b1fde9005afef5d8d4b2d98c

@JohnLKkk
Copy link
Owner

Code has been merged, thank you.

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

No branches or pull requests

2 participants