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

[FIX/#50] mvvm git 충돌 해결 #52

Merged
merged 2 commits into from
Jul 19, 2023
Merged

Conversation

gaeun5744
Copy link
Contributor

@gaeun5744 gaeun5744 commented Jul 19, 2023

✍️ 작업한 내용

  • 깃허브 충돌 오류 해결

🍀 관련 이슈

@gaeun5744 gaeun5744 self-assigned this Jul 19, 2023
Copy link
Contributor

@amourxyoung amourxyoung left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

수고하셨습니다아아

@gaeun5744 gaeun5744 merged commit ea476c7 into Team-Puzzling:develop Jul 19, 2023
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FIX] 깃허브 충돌 해결
2 participants