Merge conflict 수정중 남은 것 같습니다. 지우고 Merge 하면 될 것 같아요

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

[LeeYongJae]

앗! 감사합니다ㅠㅠ 큰일날뻔했네요