upadated user controller

Resilient-Labs · Jan 7, 2025 · 4e84741 · 4e84741
1 parent 85af4f9
commit 4e84741
Showing 1 changed file with 0 additions and 13 deletions.
diff --git a/server/controllers/user.js b/server/controllers/user.js
@@ -1,15 +1,3 @@
-<<<<<<< HEAD
-const userController = {
-    addUser: (req, res) => {
-
-    }, 
-    addFavoriteCompany: (req, res) => {
-
-    }
-  }
-
-  export default userController; 
-=======
 import { clerkClient } from '@clerk/express'
 import User from '../models/User.js'
 
@@ -48,4 +36,3 @@ const userController = {
 }
 
 export default userController
->>>>>>> 9720463ea6c04301b27af29611db85cab5fa2f8c