From d6cee57adede40ef05a1b8785834e4adebdc97e4 Mon Sep 17 00:00:00 2001 From: gom-by Date: Wed, 15 Jan 2025 15:50:45 +0100 Subject: [PATCH] resolving conflicts --- backend/main.go | 5 ----- backend/router.go | 2 -- 2 files changed, 7 deletions(-) diff --git a/backend/main.go b/backend/main.go index 8c9414b..c6656ea 100644 --- a/backend/main.go +++ b/backend/main.go @@ -17,11 +17,6 @@ func handler(w http.ResponseWriter, r *http.Request) { fmt.Fprintf(w, "

Hello, World!

") } -type ErrorResponse struct { - ErrorCode string `json:"errorCode"` - Message string `json:"message"` -} - func main() { err := godotenv.Load() if err != nil { diff --git a/backend/router.go b/backend/router.go index ae1e599..3b73316 100644 --- a/backend/router.go +++ b/backend/router.go @@ -2,9 +2,7 @@ package main import ( "net/http" - api "fr.latosa-escrima/api" "encoding/json" - core "fr.latosa-escrima/api/core" ) type JSONStatus string