From a8821ddb7d325c53c1a1406a7e7ffc2ad44217df Mon Sep 17 00:00:00 2001
From: LEEYOONGU <try3357@ajou.ac.kr>
Date: Sun, 24 Nov 2019 21:46:00 +0900
Subject: [PATCH] =?UTF-8?q?Merge=20conflict=20=EC=88=98=EC=A0=95=EC=A4=91?=
=?UTF-8?q?=20=EB=82=A8=EC=9D=80=20=EA=B2=83=20=EA=B0=99=EC=8A=B5=EB=8B=88?=
=?UTF-8?q?=EB=8B=A4.=20=EC=A7=80=EC=9A=B0=EA=B3=A0=20Merge=20=ED=95=98?=
=?UTF-8?q?=EB=A9=B4=20=EB=90=A0=20=EA=B2=83=20=EA=B0=99=EC=95=84=EC=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
backend/app.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/backend/app.js b/backend/app.js
index 0d46f30..42af07e 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -35,12 +35,12 @@ app.use(cookieParser());
app.use(express.static(path.join(__dirname, "public")));
//app.use('/', indexRouter);
-<<<<<<< HEAD
+
app.use("/api/books", bookRouter);
app.use("/api/login", loginRouter);
-=======
+
app.use('/api/books', bookRouter);
->>>>>>> master
+
//app.use('/users', usersRouter);
// catch 404 and forward to error handler
--
GitLab