diff options
| author | Miguel Jacq <mig@mig5.net> | 2018-09-15 12:07:01 +1000 |
|---|---|---|
| committer | Miguel Jacq <mig@mig5.net> | 2018-09-15 12:07:01 +1000 |
| commit | 8bb75cc5301ef74167eb24715c7309d112344461 (patch) | |
| tree | dc6d1c901c3a1995044d9d98f323b3f442f6f2b0 /onionshare/settings.py | |
| parent | e54a1473ce277ee6796b6a2ce23e3d09977372eb (diff) | |
| parent | 8312058fcc18466bc9eab3e5dced15f5fbb8ba71 (diff) | |
| download | onionshare-8bb75cc5301ef74167eb24715c7309d112344461.tar.gz onionshare-8bb75cc5301ef74167eb24715c7309d112344461.zip | |
Fix conflict in tests
Diffstat (limited to 'onionshare/settings.py')
| -rw-r--r-- | onionshare/settings.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/onionshare/settings.py b/onionshare/settings.py index c0e0e30c..ef75be2f 100644 --- a/onionshare/settings.py +++ b/onionshare/settings.py @@ -65,7 +65,6 @@ class Settings(object): 'autoupdate_timestamp': None, 'no_bridges': True, 'tor_bridges_use_obfs4': False, - 'tor_bridges_use_meek_lite_amazon': False, 'tor_bridges_use_meek_lite_azure': False, 'tor_bridges_use_custom_bridges': '', 'save_private_key': False, |