diff --git a/README.md b/README.md index e4391151699a32af21d741ce1d6bcf390cd7796d..870d0aff525c9db93f721b975b4f360df384eb70 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -<<<<<<< HEAD -# prac_c1_final_backend - + +# prac_c1_final_backend + 2021 여름학기 실전코딩1 마지막과제 - 백엔드 ======= # prac_c1_final_backend @@ -14,4 +14,5 @@ 1. npm install 2. 프론트엔드 파일을 public 폴더에 옮긴다. 3. node app.js ->>>>>>> 2f65c9d2ea867119658f5c83691ddf8b2c112b7f + +