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.

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
merged 2 commits into from
Sep 20, 2023
Merged

Fix merge unresovle #232

merged 2 commits into from
Sep 20, 2023

Conversation

ytqaljn
Copy link
Member

@ytqaljn ytqaljn commented Sep 19, 2023

  • fix unresolved conflict pushed.

@ytqaljn ytqaljn merged commit 55b0c9c into main Sep 20, 2023
@ytqaljn 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
Reviewers

@AstaFrode AstaFrode AstaFrode approved these changes

@swowk swowk swowk approved these changes

@yeousunn yeousunn yeousunn approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@ytqaljn @yeousunn @swowk @AstaFrode