1
0
mirror of https://github.com/kataras/iris.git synced 2026-01-10 21:45:57 +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

@@ -29,7 +29,7 @@ func main() {
})
app.Get("/", func(ctx iris.Context) {
ctx.ViewData("BodyMessage", "a sample text here... setted by the route handler")
ctx.ViewData("BodyMessage", "a sample text here... set by the route handler")
if err := ctx.View("index.html"); err != nil {
ctx.Application().Logger().Infof(err.Error())
}
@@ -37,7 +37,7 @@ func main() {
app.Get("/about", func(ctx iris.Context) {
ctx.ViewData("Title", "My About Page")
ctx.ViewData("BodyMessage", "about text here... setted by the route handler")
ctx.ViewData("BodyMessage", "about text here... set by the route handler")
// same file, just to keep things simple.
if err := ctx.View("index.html"); err != nil {