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

fix line endings... | Prev Commit: 15feaf0237 [formerly dced7d472edabbab4f80c76051f13261928a8dea]?w=1

Former-commit-id: 286366ffb0958288821d0b34b6140e203400c682
This commit is contained in:
kataras
2017-11-02 06:44:40 +02:00
parent 15feaf0237
commit 42bc7dbad0
5 changed files with 98 additions and 11 deletions

View File

@@ -85,7 +85,7 @@ func assetsCssBootstrapMinCss() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "assets/css/bootstrap.min.css", size: 141513, mode: os.FileMode(438), modTime: time.Unix(1499700236, 0)}
info := bindataFileInfo{name: "assets/css/bootstrap.min.css", size: 141513, mode: os.FileMode(511), modTime: time.Unix(1499700236, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -105,7 +105,7 @@ func assetsFaviconIco() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "assets/favicon.ico", size: 15086, mode: os.FileMode(438), modTime: time.Unix(1496572980, 0)}
info := bindataFileInfo{name: "assets/favicon.ico", size: 15086, mode: os.FileMode(511), modTime: time.Unix(1496572980, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}
@@ -125,7 +125,7 @@ func assetsJsJquery211Js() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "assets/js/jquery-2.1.1.js", size: 256541, mode: os.FileMode(438), modTime: time.Unix(1499700236, 0)}
info := bindataFileInfo{name: "assets/js/jquery-2.1.1.js", size: 256541, mode: os.FileMode(511), modTime: time.Unix(1499700236, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}

View File

@@ -34,9 +34,9 @@ func (r resource) loadFromBase(dir string) string {
}
result := string(b)
if runtime.GOOS != "windows" {
result = strings.Replace(result, "\n", "\r\n", -1)
}
//if runtime.GOOS != "windows" {
// result = strings.Replace(result, "\n", "\r\n", -1)
//}
return result
}