Merge remote-tracking branch 'rem/v3' into v3

2024-12-11 00:34:37 +07:00
parent 12e26d0018 21e5406e96
commit d9eb9e3c66
23 changed files with 1470 additions and 23 deletions
--- a/handler/swagger-ui/swaggerui.go
+++ b/handler/swagger-ui/swaggerui.go
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 package swaggerui // import "go.unistack.org/micro-server-http/v4/handler/swagger-ui"
+=======
+package swaggerui_handler
+>>>>>>> rem/v3

 import (
 	"embed"
--- a/handler/swagger-ui/swaggerui_test.go
+++ b/handler/swagger-ui/swaggerui_test.go
@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 package swaggerui
+=======
+package swaggerui_handler
+>>>>>>> rem/v3

 import (
 	"net/http"