teamPARK / holiday-counter-recommend-activity

Go to a project
Toggle navigation Toggle navigation pinning
박종현
217e7861 1 parent e4c0b067

Update final web design

Expand all
Inline Side-by-side
Showing 2 changed files with 0 additions and 4 deletions
...@@ -36,12 +36,8 @@ function getTodayDate() { ...@@ -36,12 +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
40 39
41 //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
42 -=======
43 - // return "2023-01-01"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04
44 ->>>>>>> 7f43fd101b38635257ae40eec3058e7997f954e5
45 return dateString; 41 return dateString;
46 } 42 }
47 43
......
This diff is collapsed. Click to expand it.