Fix merge error

-<<<<<<< HEAD
 node_modules/
 package-lock.json
-=======
-node_modules/
-package-lock.json
->>>>>>> feature/recommend-activity
 .env
\ No newline at end of file

@@ -36,8 +36,12 @@ function getTodayDate() {
   var month = ("0" + (today.getMonth() + 1)).slice(-2);
   var day = ("0" + today.getDate()).slice(-2);
   var dateString = year + "-" + month + "-" + day;
+<<<<<<< HEAD
 
   //return "2022-12-25"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04
+=======
+  // return "2023-01-01"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04
+>>>>>>> 7f43fd101b38635257ae40eec3058e7997f954e5
   return dateString;
 }