Merge main & resolve conflict

2021-02-01 00:24:45 +08:00
parent 41d682d878 c41f6dd17b
commit de5c2c9a27
105 changed files with 290 additions and 214 deletions
--- a/adapter/config/xml/xml.go
+++ b/adapter/config/xml/xml.go
@@ -20,8 +20,8 @@
 //
 // Usage:
 //  import(
-//    _ "github.com/beego/beego/v2/config/xml"
-//      "github.com/beego/beego/v2/config"
+//    _ "github.com/beego/beego/v2/core/config/xml"
+//      "github.com/beego/beego/v2/core/config"
 //  )
 //
 //  cnf, err := config.NewConfig("xml", "config.xml")