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

Feature 18 PR #23

Merged
merged 8 commits into from
Jan 21, 2025
Merged

Feature 18 PR #23

merged 8 commits into from
Jan 21, 2025

Conversation

davinyakma
Copy link
Collaborator

close #18

@rOyalFruit rOyalFruit closed this Jan 20, 2025
@rOyalFruit rOyalFruit reopened this Jan 20, 2025
@loong6138 loong6138 closed this Jan 20, 2025
@loong6138 loong6138 reopened this Jan 20, 2025
# Conflicts:
#	BackEnd/src/main/java/com/team5/nbe341team05/common/jpa/entity/BaseInitData.java
#	BackEnd/src/main/java/com/team5/nbe341team05/common/security/SecurityConfig.java
#	frontend/package-lock.json
#	frontend/package.json
#	frontend/src/App.js
#	frontend/src/DL/api.js
#	frontend/src/components/Navbar.js
#	frontend/src/components/ProductCard.js
#	frontend/src/components/ProductDetailPopup.js
#	frontend/src/components/ProductList.js
Copy link
Collaborator

@kwonkiyong0059 kwonkiyong0059 left a comment

Choose a reason for hiding this comment

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

확인했습니다. 수고하셨습니다.

@rOyalFruit rOyalFruit merged commit f1a0a89 into develop Jan 21, 2025
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.

5 participants