From 0a1f5fe27ee8cad91afd4b6db4812e05f4b75af6 Mon Sep 17 00:00:00 2001
From: V2Ray <admin@v2ray.com>
Date: Sun, 11 Oct 2015 18:27:25 +0200
Subject: [PATCH] rename config to jsonConfig to avoid name conflict

---
 config/json/json.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/config/json/json.go b/config/json/json.go
index a10f5fb6d..a00200990 100644
--- a/config/json/json.go
+++ b/config/json/json.go
@@ -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
 }