From 20600e60a178cd9427ee00496bc4a8ede39c71da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?201720783=EC=B0=A8=EC=A0=95=EB=AC=B8?=
 <1401-beegle98@users.noreply.git.ajou.ac.kr>
Date: Thu, 16 Sep 2021 06:14:18 +0000
Subject: [PATCH] Update README.md

---
 README.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index e439115..870d0af 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
+
+
-- 
GitLab