hothix : conflict

tukcomCD2024 · Jun 19, 2024 · c7d298e · c7d298e
1 parent b430fb8
commit c7d298e
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java b/BackEnd/src/main/java/springwebsocket/webchat/fcm/service/FCMNotificationService.java
@@ -26,13 +26,8 @@ public String sendNotificationByToken(FCMNotificationRequestDto requestDto) {
         if (member.isPresent()) {
             if (member.get().getFirebaseToken() != null) {
                 Map<String, String> data = new HashMap<>();
-<<<<<<< HEAD
                 data.put("title",requestDto.getTitle());
                 data.put("body",requestDto.getBody());
-=======
-                data.put("title", requestDto.getTitle());
-                data.put("body", requestDto.getBody());
->>>>>>> 2f5eb62125f5c6701b7cf15180a0af3f1751349b
 
                 Message message = Message.builder()
                         .setToken(member.get().getFirebaseToken())