Merge remote-tracking branch 'origin/develop' into develop · HongikGraduationProject/backend@89d2990 · GitHub

Commit

Merge remote-tracking branch 'origin/develop' into develop

Browse files

# Conflicts:
#	src/main/java/com/hongik/graduationproject/repository/VideoSummaryCategoryRepository.java
#	src/main/java/com/hongik/graduationproject/service/VideoSummaryService.java

Loading branch information

qjvk2880 committed Jun 30, 2024

2 parents 86c7684 + a92e60a commit 89d2990