From b31ae962e86d5c496564fe50cb5c70c3ce4e53c8 Mon Sep 17 00:00:00 2001
From: Roshan Bellary <roshan.bellary@gmail.com>
Date: Fri, 17 Jan 2025 12:04:28 -0500
Subject: [PATCH] Auth Controller Change

---
 server/src/controllers/auth.controller.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/server/src/controllers/auth.controller.ts b/server/src/controllers/auth.controller.ts
index 96f52225..d83138c6 100644
--- 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
   });
 };