fix main.go

This commit is contained in:
Blake Ridgway
2025-11-29 13:21:24 -06:00
parent f4c47b748e
commit b63046251e

View File

@@ -129,8 +129,6 @@ func setupRoutes(r *chi.Mux) {
// Training zones // Training zones
r.Get("/zones", equipmentHandler.GetTrainingZones) r.Get("/zones", equipmentHandler.GetTrainingZones)
<<<<<<< HEAD
=======
// Workout routes // Workout routes
workoutHandler := workout.NewHandler() workoutHandler := workout.NewHandler()
@@ -141,7 +139,6 @@ func setupRoutes(r *chi.Mux) {
r.Delete("/workouts", workoutHandler.DeleteWorkout) r.Delete("/workouts", workoutHandler.DeleteWorkout)
r.Get("/workout-types", workoutHandler.GetWorkoutTypes) r.Get("/workout-types", workoutHandler.GetWorkoutTypes)
r.Post("/workouts/upload", workoutHandler.UploadWorkoutFile) r.Post("/workouts/upload", workoutHandler.UploadWorkoutFile)
>>>>>>> 64e8d77 (add routes back)
}) })
log.Println("✅ Routes registered successfully") log.Println("✅ Routes registered successfully")