Merge branch 'release-0.2.2'0.2.2

2 files changed, 0 insertions, 26 deletions

diff --git a/pkg/branding/__init__.py b/pkg/branding/__init__.py
deleted file mode 100644
index 0bd6befb..00000000
--- a/pkg/branding/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-from .config import APP_BASE_NAME, APP_PREFIX, BRANDED_BUILD, BRANDED_OPTS
-
-
-def get_name():
-    if BRANDED_BUILD is True:
-        return APP_PREFIX + BRANDED_OPTS.get('short_name', 'name_unknown')
-    else:
-        return APP_BASE_NAME
-
-
-def get_shortname():
-    if BRANDED_BUILD is True:
-        return BRANDED_OPTS.get('short_name', 'name_unknown')
-
-__all__ = ['get_name']
diff --git a/pkg/branding/config.py b/pkg/branding/config.py
deleted file mode 100644
index bcacc3bc..00000000
--- a/pkg/branding/config.py
+++ /dev/null
@@ -1,11 +0,0 @@
-# Configuration file for branding
-
-BRANDED_BUILD = False
-
-APP_BASE_NAME = "leap-client"
-APP_PREFIX = "%s-" % APP_BASE_NAME
-
-BRANDED_OPTS = {
-    'short_name': "",
-    'provider_domain': "",
-    'provider_ca_path': ""}