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/gui/__init__.py | |
| 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/gui/__init__.py')
| -rw-r--r-- | src/leap/bitmask/gui/__init__.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/leap/bitmask/gui/__init__.py b/src/leap/bitmask/gui/__init__.py index 94bf1fd5..bba02061 100644 --- a/src/leap/bitmask/gui/__init__.py +++ b/src/leap/bitmask/gui/__init__.py @@ -19,5 +19,6 @@ init file for leap.gui """ # This was added for coverage and testing, but when doing the osx # bundle with py2app it fails because of this, so commenting for now +# Also creates conflicts with the new frontend/backend separation. # app = __import__("app", globals(), locals(), [], 2) # __all__ = [app] |