rename config to jsonConfig to avoid name conflict

This commit is contained in:
V2Ray
2015-10-11 18:27:25 +02:00
parent 37112f737e
commit 0a1f5fe27e
+3 -3
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
}