From b63046251e52c06f93eedc8f6d7a27c64a5b87ec Mon Sep 17 00:00:00 2001 From: Blake Ridgway Date: Sat, 29 Nov 2025 13:21:24 -0600 Subject: [PATCH] fix main.go --- cmd/server/main.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/cmd/server/main.go b/cmd/server/main.go index f04e526..7b653c4 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -129,8 +129,6 @@ func setupRoutes(r *chi.Mux) { // Training zones r.Get("/zones", equipmentHandler.GetTrainingZones) -<<<<<<< HEAD -======= // Workout routes workoutHandler := workout.NewHandler() @@ -141,7 +139,6 @@ func setupRoutes(r *chi.Mux) { r.Delete("/workouts", workoutHandler.DeleteWorkout) r.Get("/workout-types", workoutHandler.GetWorkoutTypes) r.Post("/workouts/upload", workoutHandler.UploadWorkoutFile) ->>>>>>> 64e8d77 (add routes back) }) log.Println("✅ Routes registered successfully")