Skip to content
Snippets Groups Projects
Commit a8821ddb authored by LEEYOONGU's avatar LEEYOONGU
Browse files

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

parent 9dce85c1
No related branches found
No related tags found
1 merge request!6Login 기능 추가
......@@ -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
......
  • Owner

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

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment