Resolve conflict in films.js inside services folder

SkylabCoders · May 9, 2021 · 9d5253b · 9d5253b
1 parent 0a58772
commit 9d5253b
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 13 deletions.
diff --git a/00-TEAMS/06-TEAM/package-lock.json b/00-TEAMS/06-TEAM/package-lock.json
diff --git a/00-TEAMS/06-TEAM/src/common/services/films.js b/00-TEAMS/06-TEAM/src/common/services/films.js
@@ -15,8 +15,5 @@ export const getCast = (entryPoint) => http.get(`/movie/${entryPoint}/credits?ap
 export const getRecommended = (entryPoint) => http.get(`/movie/${entryPoint}/recommendations?api_key=${API_KEY}&language=en-US&page=1`);
 export const getShows = (entryPoint) => http.get(`/tv/${entryPoint}?api_key=${API_KEY}`);
 export const getGrid = (entryPoint) => http.get(`/movie/${entryPoint}?api_key=${API_KEY}&language=en-US&page=1`);
-<<<<<<< HEAD
 export const getResults = (entryPoint) => http.get(`search/movie?api_key=${API_KEY}&query=${entryPoint}`);
-=======
 export const getShowsPopular = (entryPoint) => http.get(`/tv/${entryPoint}/recommendations?api_key=${API_KEY}`);
->>>>>>> Grupo_6