Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
MajorBook - Team202
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
LeeYongJae
MajorBook - Team202
Commits
a8821ddb
Commit
a8821ddb
authored
5 years ago
by
LEEYOONGU
Browse files
Options
Downloads
Patches
Plain Diff
Merge conflict 수정중 남은 것 같습니다. 지우고 Merge 하면 될 것 같아요
parent
9dce85c1
No related branches found
Branches containing commit
No related tags found
1 merge request
!6
Login 기능 추가
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
backend/app.js
+3
-3
3 additions, 3 deletions
backend/app.js
with
3 additions
and
3 deletions
backend/app.js
+
3
−
3
View file @
a8821ddb
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
LeeYongJae
@dragonash
·
5 years ago
Owner
앗! 감사합니다ㅠㅠ 큰일날뻔했네요
앗! 감사합니다ㅠㅠ 큰일날뻔했네요
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment