Merge pull request #312 from kimw/patch-1

remove duplicated line (refer line 221)
This commit is contained in:
clowwindy 2015-03-14 13:38:19 +08:00
commit 5c0391d146
1 changed files with 0 additions and 1 deletions

View File

@ -221,7 +221,6 @@ def get_config(is_local):
config['workers'] = config.get('workers', 1)
config['pid-file'] = config.get('pid-file', '/var/run/shadowsocks.pid')
config['log-file'] = config.get('log-file', '/var/log/shadowsocks.log')
config['workers'] = config.get('workers', 1)
config['verbose'] = config.get('verbose', False)
config['local_address'] = to_str(config.get('local_address', '127.0.0.1'))
config['local_port'] = config.get('local_port', 1080)