Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
students
butter-studio
Commits
d2351773
Commit
d2351773
authored
Jul 19, 2021
by
Jiwon Yoon
Browse files
git rm
parent
c71167c9
Changes
2
Hide whitespace changes
Inline
Side-by-side
.env.development
deleted
100644 → 0
View file @
c71167c9
PG_DATABASE=butterDB
PG_USER=butter
PG_PASSWORD=butter
TMDB_APP_KEY=1477348488076cafd4dcf973a314957d
REACT_APP_KAKAO_KEY=a04f2d1d1722f5fbadd556e742465d9f
server/controllers/movie.controller.js
View file @
d2351773
...
...
@@ -69,9 +69,6 @@ const upcommingMovie = async (req, res) => {
}
}
<<<<<<<
HEAD
export
default
{
comparePopularMovie
,
upcommingMovie
}
=======
const
create
=
async
(
req
,
res
)
=>
{
try
{
const
{
movieId
}
=
req
.
params
...
...
@@ -86,4 +83,3 @@ export default {
comparePopularMovie
,
create
,
}
>>>>>>>
kimpen
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment