diff options
| author | Olivier Dony <odo@openerp.com> | 2011-10-13 19:03:27 +0200 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2011-10-13 19:03:27 +0200 |
| commit | 3bffe65b2ca8bc50ece644e7947ad2bbd5c9341a (patch) | |
| tree | b307874680dbdce7b2f5109b7b696ea38e679e20 /addons/pad/__init__.py | |
| parent | a93ca01b5b1365f92e191e3c429ef655e751b455 (diff) | |
| parent | 8a7c61cb96a541a9aaca51ffe3ee903407b26360 (diff) | |
[MERGE] sync with latest trunk
bzr revid: odo@openerp.com-20111013170327-9rvfdkbgj01hdgxb
Diffstat (limited to 'addons/pad/__init__.py')
| -rw-r--r-- | addons/pad/__init__.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/pad/__init__.py b/addons/pad/__init__.py index 6a60bdb9799..df35bc32106 100644 --- a/addons/pad/__init__.py +++ b/addons/pad/__init__.py @@ -1,2 +1,2 @@ # -*- coding: utf-8 -*- -import company_pad +import res_company |