From daf462a2b6599ac5a5328462237b8745f62ad2d5 Mon Sep 17 00:00:00 2001
From: Hanvp <nwactris@naver.com>
Date: Sun, 27 Aug 2023 20:40:33 +0900
Subject: [PATCH] =?UTF-8?q?:bug:=20Feature/78=20merge=20=EC=B6=A9=EB=8F=8C?=
 =?UTF-8?q?=20=ED=95=B4=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

application.yml에서 충돌난 부분 해결
---
 src/main/resources/application.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index e625331..083e2ce 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -79,13 +79,13 @@ jwt:
   access-token-validity-in-seconds: 1210000000 # 30 m
   refresh-token-validity-in-seconds: 1210000000 # 14 d
 
-<<<<<<< HEAD
+
 paging:
   size : 10
-=======
+
 naver-sms:
   accessKey: ${NAVER_SMS_ACCESSKEY}
   secretKey: ${NAVER_SMS_SECRET}
   serviceId: ${NAVER_SMS_SERVICEID}
   senderPhone: ${NAVER_SMS_PHONE}
->>>>>>> a1ef31e18cf1f7e1ddb2e834114f0bfd38c1dd7f
+