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/#563 머지 컨플릭트 해결 #564

Merged
merged 1 commit into from
Apr 7, 2024
Merged

Fix/#563 머지 컨플릭트 해결 #564

merged 1 commit into from
Apr 7, 2024

Conversation

cruelladevil
Copy link
Collaborator

@cruelladevil cruelladevil commented Apr 7, 2024

📝작업 내용

이번 PR에서 작업한 내용을 간략히 설명(이미지 첨부 가능)

EditProfilePage, RegisterPart에 대한 머지 컨플릭트 수정

💬리뷰 참고사항

원활한 리뷰를 위해 전달하고 싶은 맥락(특정 파일, 디렉터리 등등)
리뷰어가 특별히 봐주었으면 하는 부분

#️⃣연관된 이슈

연관된 이슈 번호를 모두 작성

close #563

@cruelladevil cruelladevil added 🦋 Bug 🚨 버그 발생! 🚨 [ 🌞 FE ] 프론트엔드 크루들의 빛나는 개발 이야기 하나둘셋 호! labels Apr 7, 2024
@cruelladevil cruelladevil self-assigned this Apr 7, 2024
Copy link

github-actions bot commented Apr 7, 2024

Unit Test Results

  98 files    98 suites   9s ⏱️
389 tests 388 ✔️ 1 💤 0
394 runs  393 ✔️ 1 💤 0

Results for commit 27ca75e.

@cruelladevil cruelladevil merged commit facab98 into main Apr 7, 2024
4 checks passed
@cruelladevil cruelladevil deleted the fix/#563 branch April 7, 2024 15:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🦋 Bug 🚨 버그 발생! 🚨 [ 🌞 FE ] 프론트엔드 크루들의 빛나는 개발 이야기 하나둘셋 호!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] 머지 컨플릭트
1 participant