github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

rename config to jsonConfig to avoid name conflict

pull/40/head
V2Ray 2015-10-11 18:27:25 +02:00
parent 37112f737e
commit 0a1f5fe27e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/json/json.go
View File

@ -81,12 +81,12 @@ func LoadConfig(file string) (*Config, error) {
return nil, err
}
config := &Config{}
err = json.Unmarshal(rawConfig, config)
jsonConfig := &Config{}
err = json.Unmarshal(rawConfig, jsonConfig)
if err != nil {
log.Error("Failed to load server config: %v", err)
return nil, err
}
return config, err
return jsonConfig, err
}