fix: 그룹기능 수정

2024-Hanium-PlanDing · May 17, 2024 · 872466b · 872466b
1 parent 785ba6e
commit 872466b
Showing 1 changed file with 1 addition and 8 deletions.
diff --git a/src/main/java/com/tukorea/planding/domain/group/service/GroupInviteService.java b/src/main/java/com/tukorea/planding/domain/group/service/GroupInviteService.java
@@ -2,18 +2,11 @@
 
 import com.tukorea.planding.domain.group.dto.GroupInviteEvent;
 import com.tukorea.planding.domain.group.dto.request.GroupInviteRequest;
-<<<<<<<HEAD
-import com.tukorea.planding.domain.group.entity.GroupRoom;
-import com.tukorea.planding.domain.group.entity.UserGroup;
-import com.tukorea.planding.domain.group.service.query.GroupQueryService;
-import com.tukorea.planding.domain.group.dto.response.GroupInviteMessageResponse;
-import com.tukorea.planding.domain.notify.service.NotificationService;
-=======
 import com.tukorea.planding.domain.group.dto.response.GroupInviteMessageResponse;
 import com.tukorea.planding.domain.group.entity.GroupRoom;
 import com.tukorea.planding.domain.group.entity.UserGroup;
 import com.tukorea.planding.domain.group.service.query.GroupQueryService;
->>>>>>>groupInvite
+import com.tukorea.planding.domain.notify.service.NotificationService;
 import com.tukorea.planding.domain.user.dto.UserInfo;
 import com.tukorea.planding.domain.user.entity.User;
 import com.tukorea.planding.domain.user.service.UserQueryService;