Merge pull request shadowsocks#312 from kimw/patch-1

remove duplicated line (refer line 221)
JustgoFlyme · Mar 14, 2015 · 5c0391d · 5c0391d
2 parents f17da94 + e17279e
commit 5c0391d
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py
@@ -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)