resolving conflicts

2025-01-29 18:32:44 +01:00
parent 107ff81e9e 2d5747ec08
commit e62f187418
74 changed files with 1320 additions and 483 deletions
--- a/backend/api/blogs/delete.go
+++ b/backend/api/blogs/delete.go
@@ -1,4 +1,5 @@
 package blogs
+<<<<<<< HEAD

 import (
 	"context"
@@ -30,3 +31,5 @@ func HandleDelete(w http.ResponseWriter, r *http.Request) {
 		Message: "Blog deleted.",
 	}.Respond(w, http.StatusOK)
 }
+=======
+>>>>>>> dev/cedric