conflictcorrect

@@ -178,7 +178,6 @@ export const postGithubLogin = (req, res) => {
   res.redirect(`/users/${userId}`);
   res.redirect(`/users/${userId}`);
 };
 };
 
 
-<<<<<<< HEAD
 export const logout = (req,res)=>{
 export const logout = (req,res)=>{
     req.logout();
     req.logout();
     res.redirect("/");
     res.redirect("/");
@@ -194,9 +193,7 @@ const getRepos = async(req,res) =>{
     const firstRepoUrl = latelyRepos.[0].html_url;
     const firstRepoUrl = latelyRepos.[0].html_url;
     const secondRepoUrl = latelyRepos.[1].html_url;
     const secondRepoUrl = latelyRepos.[1].html_url;
 };
 };
-=======
 export const logout = (req, res) => {
 export const logout = (req, res) => {
   req.logout();
   req.logout();
   res.redirect("/");
   res.redirect("/");
 };
 };
->>>>>>> 29aa84017aef7f3207044abc818143e72cf33907