diff options
| author | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2014-07-18 11:22:47 -0300 |
| commit | 159dbe295148975bdfe9a50f871254aa9adf2328 (patch) | |
| tree | 5b679b7f617c4bc09c25a4c369e77156f0ff3e2c /src/leap/bitmask/config | |
| parent | 7858d83af4a09ab00f6ba33dd8dbcf07ade101ce (diff) | |
| parent | 312746bc9b77f0f738ccf2192d81ab94fdf9d6ba (diff) | |
Merge branch 'release-0.6.0'0.6.0
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'} |