balki/pgweb
1
0
Fork 0
Code Pull Requests Activity

Resolve conflict with master

Browse Source
This commit is contained in:
Dan Sosedoff
2016-11-15 21:51:23 -06:00
parent 7467553bf2 d74bc06cbd
commit e1edc5b550
7 changed files with 141 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/data/bindata.go
View File

@@ -359,7 +359,7 @@ func staticJsAppJs() (*asset, error) {
return nil, err
}
info := bindataFileInfo{name: "static/js/app.js", size: 29571, mode: os.FileMode(420), modTime: time.Unix(1479264852, 0)}
info := bindataFileInfo{name: "static/js/app.js", size: 29571, mode: os.FileMode(420), modTime: time.Unix(1479268217, 0)}
a := &asset{bytes: bytes, info: info}
return a, nil
}