more fixes

2025-11-29 13:22:57 -06:00
parent b63046251e
commit 474029075d
1 changed files with 0 additions and 3 deletions
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -33,10 +33,7 @@ func main() {
 		&user.PasswordReset{},
 		&user.Session{},
 		&equipment.Equipment{},
-<<<<<<< HEAD
-=======
 		&workout.Workout{},
->>>>>>> 64e8d77 (add routes back)
 	); err != nil {
 		log.Fatalf("Failed to migrate database: %v", err)
 	}