1
0
mirror of https://github.com/kataras/iris.git synced 2025-12-17 18:07:01 +00:00

resolve conflicts with current master v11.1.1

Former-commit-id: 659ff392e889f3a8552d7da3d44848f1a364f7b2
This commit is contained in:
Gerasimos (Makis) Maropoulos
2019-07-23 19:20:07 +03:00
41 changed files with 406 additions and 70 deletions

View File

@@ -48,7 +48,7 @@ func (c Configuration) Set(main *Configuration) {
}
var (
// URL if setted then it sets the httptest's BaseURL.
// URL if set then it sets the httptest's BaseURL.
// Defaults to empty string "".
URL = func(schemeAndHost string) OptionSet {
return func(c *Configuration) {