teamPARK / holiday-counter-recommend-activity

Go to a project
Toggle navigation Toggle navigation pinning
박지환
d0d8326c 1 parent 1a264def

Hotfix merge error

Inline Side-by-side
Showing 2 changed files with 1 additions and 11 deletions
1 -<<<<<<< HEAD
2 -node_modules/
3 -package-lock.json
4 -=======
5 node_modules/ 1 node_modules/
6 package-lock.json 2 package-lock.json
7 ->>>>>>> feature/recommend-activity
8 .env 3 .env
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -36,13 +36,8 @@ function getTodayDate() { ...@@ -36,13 +36,8 @@ function getTodayDate() {
36 var month = ("0" + (today.getMonth() + 1)).slice(-2); 36 var month = ("0" + (today.getMonth() + 1)).slice(-2);
37 var day = ("0" + today.getDate()).slice(-2); 37 var day = ("0" + today.getDate()).slice(-2);
38 var dateString = year + "-" + month + "-" + day; 38 var dateString = year + "-" + month + "-" + day;
39 -<<<<<<< HEAD 39 + // return "2023-01-01"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04
40 - return "2023-01-01"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04
41 - //return dateString;
42 -=======
43 - //return "2022-12-25"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04
44 return dateString; 40 return dateString;
45 ->>>>>>> feature/recommend-activity
46 } 41 }
47 42
48 // To get modified date from locdate 43 // To get modified date from locdate
......