diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-02-10 11:34:26 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-02-10 11:34:26 +0100 |
| commit | af8864d571bdaf0b87a63ca6fa0a4fb5ea5c36f0 (patch) | |
| tree | 5d6c384d5e5e7cb90a1ec20bae611194a7b3af6a /addons/web/controllers/__init__.py | |
| parent | 96cbcdcf2f3613b453fda9a4eaaac02090458a44 (diff) | |
[FIX] imports to handle conflicts with e.g. web.py in embedded mode
bzr revid: xmo@openerp.com-20120210103426-b20ass3mwx2ay9c4
Diffstat (limited to 'addons/web/controllers/__init__.py')
| -rw-r--r-- | addons/web/controllers/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/controllers/__init__.py b/addons/web/controllers/__init__.py index 8ee9bae18d9..12a7e529b67 100644 --- a/addons/web/controllers/__init__.py +++ b/addons/web/controllers/__init__.py @@ -1 +1 @@ -import main +from . import main |