push before pull

Author: [Lunarian0928]

.gradle/8.0.2/checksums/checksums.lock

@@ -5,17 +5,10 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://52.79.226.130:56255/contents?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul
 
 # DB username
-<<<<<<< HEAD
 spring.datasource.username=jongyoung3
 
 # DB password
 spring.datasource.password=1q2w3e4r!
-=======
-spring.datasource.username=seon
-
-# DB password
-spring.datasource.password=kyungseon
->>>>>>> d46fe6bc898d1fbee3c832c8e331bf1b74112e55
 
 # true 설정시 JPA 쿼리문 확인 가능
 spring.jpa.show-sql=false

.gradle/8.0.2/fileChanges/last-build.bin

@@ -24,7 +24,7 @@
 public class CrawlingService {
 
     public static final String WEB_DRIVER_ID = "webdriver.chrome.driver";
-    public static final String WEB_DRIVER_PATH = "/Users/seon/Downloads/chromedriver-mac-arm64/chromedriver";
+    public static final String WEB_DRIVER_PATH = "/Users/rla/Desktop/chromedriver-win64/chromedriver-win64/chromedriver.exe";
 
     public List<String> getImg(String imgName) throws IOException {
         // 크롬 드라이버 설정

.gradle/8.0.2/fileHashes/fileHashes.lock

@@ -23,7 +23,8 @@ public class RestaurantService {
 
     public static final String baseUrl = "https://m.map.naver.com/search2/search.naver?query=";
     public static final String WEB_DRIVER_ID = "webdriver.chrome.driver";
-    public static final String WEB_DRIVER_PATH = "/Users/seon/Downloads/chromedriver-mac-arm64/chromedriver";
+    public static final String WEB_DRIVER_PATH = "/Users/rla/Desktop/chromedriver-win64/chromedriver-win64/chromedriver.exe";
+
     public List<String> getRestaurant(String restaurantName) throws IOException {
         // 크롬 드라이버 설정
         System.setProperty(WEB_DRIVER_ID, WEB_DRIVER_PATH);

.gradle/8.0.2/gc.properties

@@ -5,17 +5,10 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.url=jdbc:mysql://52.79.226.130:56255/contents?useSSL=false&useUnicode=true&serverTimezone=Asia/Seoul
 
 # DB username
-<<<<<<< HEAD
 spring.datasource.username=jongyoung3
 
 # DB password
 spring.datasource.password=1q2w3e4r!
-=======
-spring.datasource.username=seon
-
-# DB password
-spring.datasource.password=kyungseon
->>>>>>> d46fe6bc898d1fbee3c832c8e331bf1b74112e55
 
 # true 설정시 JPA 쿼리문 확인 가능
 spring.jpa.show-sql=false