Skip to content

GitLab

Commit d2351773 authored by Jiwon Yoon's avatar Jiwon Yoon
Browse files

git rm

parent c71167c9
Show 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) => { ...@@ -69,9 +69,6 @@ const upcommingMovie = async (req, res) => {
} }
} }
<<<<<<< HEAD
export default { comparePopularMovie, upcommingMovie }
=======
const create = async (req, res) => { const create = async (req, res) => {
try { try {
const { movieId } = req.params const { movieId } = req.params
...@@ -86,4 +83,3 @@ export default { ...@@ -86,4 +83,3 @@ export default {
comparePopularMovie, comparePopularMovie,
create, create,
} }
>>>>>>> kimpen
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment