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

[PR] develop merge #62

Merged
merged 15 commits into from
Apr 17, 2024
Merged

[PR] develop merge #62

merged 15 commits into from
Apr 17, 2024

Conversation

CJC0512
Copy link
Contributor

@CJC0512 CJC0512 commented Apr 17, 2024

이 PR이 해결하는 문제

  • develop 빠진 변경사항 반영

변경 내용

  • develop 빠진 변경사항 반영

CJC0512 and others added 15 commits April 15, 2024 19:44
[PR] 로그인 시 헤더 내용 추가, 마이페이지 작성
# Conflicts:
#	src/main/java/org/omoknoone/onionhotsayyo/post/repository/PostRepository.java
#	src/main/java/org/omoknoone/onionhotsayyo/post/service/PostService.java
#	src/main/java/org/omoknoone/onionhotsayyo/post/service/PostServiceImpl.java
Feature/hot post & translate-search(header) 충돌 해결 후 develop merge
@CJC0512 CJC0512 merged commit dbd1a73 into main Apr 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants