diff options
| author | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
|---|---|---|
| committer | Justin Nuß <nuss.justin@gmail.com> | 2014-07-26 11:23:58 +0200 |
| commit | 91480f3791f266369c343c539f8eeec245fa969a (patch) | |
| tree | a03ad6062fe4b546367cdb6f9921399458d97441 /modules/base/base.go | |
| parent | 835e85b5ce9921ffd4d50b90b706e02685167331 (diff) | |
| parent | 35c75f06a0a4f321021984830d760e67ca0ef8e5 (diff) | |
Merge branch 'dev' of https://github.com/gogits/Gogs into issue/281
Conflicts:
modules/base/tool.go
Diffstat (limited to 'modules/base/base.go')
| -rw-r--r-- | modules/base/base.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/modules/base/base.go b/modules/base/base.go index 570600c3..cb514782 100644 --- a/modules/base/base.go +++ b/modules/base/base.go @@ -5,9 +5,7 @@ package base type ( - // Type TmplData represents data in the templates. - TmplData map[string]interface{} - TplName string + TplName string ApiJsonErr struct { Message string `json:"message"` |