git rm

.env.development

-PG_DATABASE=butterDB
-PG_USER=butter
-PG_PASSWORD=butter
-TMDB_APP_KEY=1477348488076cafd4dcf973a314957d
-REACT_APP_KAKAO_KEY=a04f2d1d1722f5fbadd556e742465d9f

server/controllers/movie.controller.js

@@ -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