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

resolve conflict #307

Merged

ktkfree merged 1 commit into develop from resolve_conflict

Jan 15, 2024

Contributor

ktkfree commented Jan 15, 2024

resolve conflict


          resolve conflict

900a81b

ktkfree requested a review from cho4036

January 15, 2024 01:39

cho4036 approved these changes

View reviewed changes

ktkfree merged commit e84fb6d into develop

1 check passed

ktkfree deleted the resolve_conflict branch

January 15, 2024 01:40

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

Labels

None yet