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

Jump to bottom

Fix merge unresovle #232

Merged

ytqaljn merged 2 commits into main from fix-merge-unsovle

Sep 20, 2023

Member

ytqaljn commented Sep 19, 2023

fix unresolved conflict pushed.

ytqaljn added 2 commits

September 19, 2023 02:52


          fix: unresolved conflict

f238e39


          fix: unresolved conflic

9b9a939

AstaFrode approved these changes

View reviewed changes

swowk approved these changes

View reviewed changes

yeousunn approved these changes

View reviewed changes

ytqaljn merged commit 55b0c9c into main

1 check failed

ytqaljn deleted the fix-merge-unsovle branch

September 20, 2023 01:20

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet