diff options
| author | Xavier Morel <xmo@openerp.com> | 2013-10-14 14:13:19 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2013-10-14 14:13:19 +0200 |
| commit | 5c75678f94c88b7ad91e45bc8a28b68fc4d8bf76 (patch) | |
| tree | 299d271d621b544369e881f953c70ae7e196d9cc /addons/website/models/__init__.py | |
| parent | a3c11bedb8148be6e35291d6955994943cc95f71 (diff) | |
[FIX] broken merge hidden by leftover pyc file
bzr revid: xmo@openerp.com-20131014121319-ry0s5tnpz5f21aw0
Diffstat (limited to 'addons/website/models/__init__.py')
| -rw-r--r-- | addons/website/models/__init__.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/addons/website/models/__init__.py b/addons/website/models/__init__.py index 23f91ffe9f6..a5710fcf331 100644 --- a/addons/website/models/__init__.py +++ b/addons/website/models/__init__.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- -import ir_fields import ir_ui_view import website import ir_rule |