Auth Controller Change

hack4impact-upenn · Jan 17, 2025 · b31ae96 · b31ae96
1 parent 898cd5d
commit b31ae96
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.ts
@@ -118,8 +118,6 @@ const logout = async (
         }
       });
     }
-<<<<<<< HEAD
-=======
     // Datadog logout
     logger_info.info('Logout');
 
@@ -128,7 +126,6 @@ const logout = async (
       distinct_id: req.user ? (req.user as IUser)._id : undefined,
       email: req.user ? (req.user as IUser).email : undefined,
     });
->>>>>>> f1f4ef540e1b7be713682effef4065efbcd7b07e
   });
 };