mirror of
https://github.com/onionshare/onionshare.git
synced 2025-05-07 17:05:16 -04:00
Fix conflicts arising from the reuse_private_key branch
This commit is contained in:
commit
76cf0ae107
14 changed files with 178 additions and 38 deletions
|
@ -60,7 +60,11 @@ class TestSettings:
|
|||
'autoupdate_timestamp': None,
|
||||
'no_bridges': True,
|
||||
'tor_bridges_use_obfs4': False,
|
||||
'tor_bridges_use_custom_bridges': ''
|
||||
'tor_bridges_use_custom_bridges': '',
|
||||
'save_private_key': False,
|
||||
'private_key': '',
|
||||
'slug': '',
|
||||
'hidservauth_string': ''
|
||||
}
|
||||
|
||||
def test_fill_in_defaults(self, settings_obj):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue