From 9a385322f216e6bd409fcd7e2dad7c9b55b67a41 Mon Sep 17 00:00:00 2001
From: HyoBN <qls0786@naver.com>
Date: Fri, 9 Aug 2024 16:54:17 +0900
Subject: [PATCH] Conflict Resolve

---
 src/main/resources/application.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index ebc4e66..f331f9d 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -75,8 +75,8 @@ jwt:
   authorities-key: authoritiesKey
   access-token-validity-in-seconds: 180000 # 3 min
   refresh-token-validity-in-seconds: 600000 # 5 min
+
 firebase:
-#  admin-sdk: firebase/firebase-adminsdk-keyfile.json
   admin-sdk: ${FCM_KEY}
 
 cloud:
@@ -147,7 +147,6 @@ jwt:
   refresh-token-validity-in-seconds: 3000000 # 14 d
 
 firebase:
-#  admin-sdk: firebase/firebase-adminsdk-keyfile.json
   admin-sdk: ${FCM_KEY}
 
 cloud: