teamPARK / holiday-counter-recommend-activity

Go to a project
Toggle navigation Toggle navigation pinning
박종현
e4c0b067 2 parents c844a674 7f43fd10

Fix merge error

Expand all
Inline Side-by-side
Showing 3 changed files with 4 additions and 5 deletions
1 -<<<<<<< HEAD
2 node_modules/ 1 node_modules/
3 package-lock.json 2 package-lock.json
4 -=======
5 -node_modules/
6 -package-lock.json
7 ->>>>>>> feature/recommend-activity
8 .env 3 .env
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -36,8 +36,12 @@ function getTodayDate() { ...@@ -36,8 +36,12 @@ 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
40 //return "2022-12-25"; // 테스트용 날짜를 입력하세요. *** 테스트가 끝나면 주석처리하고 커밋해주세요. *** ex) 2022-09-12, 2022-09-15, 2022-10-04 41 //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
41 return dateString; 45 return dateString;
42 } 46 }
43 47
......
This diff is collapsed. Click to expand it.