teamPARK / holiday-counter-recommend-activity

Go to a project
Toggle navigation Toggle navigation pinning
박종현
c844a674 1 parent 1a264def

Fix error due to merge

Expand all
Inline Side-by-side
Showing 2 changed files with 1 additions and 5 deletions
...@@ -36,13 +36,9 @@ function getTodayDate() { ...@@ -36,13 +36,9 @@ 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 +
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 40 //return "2022-12-25"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04
44 return dateString; 41 return dateString;
45 ->>>>>>> feature/recommend-activity
46 } 42 }
47 43
48 // To get modified date from locdate 44 // To get modified date from locdate
......
This diff is collapsed. Click to expand it.