diff options
| author | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:54:22 -0400 |
|---|---|---|
| committer | Unknown <joe2010xtmf@163.com> | 2014-03-25 06:54:22 -0400 |
| commit | e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5 (patch) | |
| tree | 746b1ab1ab5626fb20ddd04121c29a951a6f84b3 /modules/base | |
| parent | eeb793524f2da4afdca017b585d9cfb6e9628e85 (diff) | |
| parent | 94ac5ebb9f100c77da02b56961119a25cd9e6d20 (diff) | |
| download | gitea-e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5.tar.gz gitea-e95be2cb3e1e320ecd86f0743acaeeb76f50e3e5.zip | |
Merge branch 'master' of github.com:gogits/gogs
Conflicts:
conf/app.ini
Diffstat (limited to 'modules/base')
| -rw-r--r-- | modules/base/conf.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/base/conf.go b/modules/base/conf.go index c692ddc23f..d0f8ae2cc8 100644 --- a/modules/base/conf.go +++ b/modules/base/conf.go @@ -243,7 +243,7 @@ func newNotifyMailService() { } func NewConfigContext() { - var err error + //var err error workDir, err := exeDir() if err != nil { fmt.Printf("Fail to get work directory: %s\n", err) |