diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-16 16:42:03 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-16 16:42:03 -0300 |
| commit | 34457adc72a4a4c0b4bff4791f4329bca66162c1 (patch) | |
| tree | 279542ab3ce460d1f0bcd7943352c3e792c9f2c6 /src/leap/bitmask/config | |
| parent | 4f946ea2189e78da0488a28b3bb8a8aed997a1c5 (diff) | |
| parent | 3d6629348aedf2a6863d242d96d64b3492e86f9a (diff) | |
Merge remote-tracking branch 'refs/remotes/ivan/feature/new-frontend-backend' into develop
Diffstat (limited to 'src/leap/bitmask/config')
| -rw-r--r-- | src/leap/bitmask/config/flags.py | 2 | ||||
| -rw-r--r-- | src/leap/bitmask/config/provider_spec.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/leap/bitmask/config/flags.py b/src/leap/bitmask/config/flags.py index 2f3fdde4..6b70659d 100644 --- a/src/leap/bitmask/config/flags.py +++ b/src/leap/bitmask/config/flags.py @@ -55,5 +55,3 @@ OPENVPN_VERBOSITY = 1 # Skip the checks in the wizard, use for testing purposes only! SKIP_WIZARD_CHECKS = False - -CURRENT_VPN_COUNTRY = None diff --git a/src/leap/bitmask/config/provider_spec.py b/src/leap/bitmask/config/provider_spec.py index cf942c7b..a1d91b90 100644 --- a/src/leap/bitmask/config/provider_spec.py +++ b/src/leap/bitmask/config/provider_spec.py @@ -37,7 +37,7 @@ leap_provider_spec = { 'default': {u'en': u'Test Provider'} }, 'description': { - #'type': LEAPTranslatable, + # 'type': LEAPTranslatable, 'type': dict, 'format': 'translatable', 'default': {u'en': u'Test provider'} |