diff options
| author | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-02 10:58:27 +0530 |
|---|---|---|
| committer | Rucha (Open ERP) <rpa@tinyerp.com> | 2011-11-02 10:58:27 +0530 |
| commit | 2fdecf4717080ea98a514b67dedefc27d76c6727 (patch) | |
| tree | bb54dd0e81af0bbf999fee1110fecb9e507f51e1 /addons/google_map/__init__.py | |
| parent | 9fe0f6fa83b84d0806359bdc2a3ae31dfb7e997a (diff) | |
| parent | 3d22bb8b55d48e5ee8226f023555f003288b157a (diff) | |
[MERGE]: Merge with latest trunk
bzr revid: rpa@tinyerp.com-20111102052827-0bctjrhb4amyg6pl
Diffstat (limited to 'addons/google_map/__init__.py')
| -rw-r--r-- | addons/google_map/__init__.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/addons/google_map/__init__.py b/addons/google_map/__init__.py index aa250662a11..d276c1debeb 100644 --- a/addons/google_map/__init__.py +++ b/addons/google_map/__init__.py @@ -19,7 +19,6 @@ # ############################################################################## -import google_map -import wizard +import google_map_launch # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |