diff options
| author | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-03-26 10:03:35 +0100 |
|---|---|---|
| committer | Richard Mathot (OpenERP) <rim@openerp.com> | 2014-03-26 10:03:35 +0100 |
| commit | fd6973dcd9561f4f413cbe547d764b17b52babc3 (patch) | |
| tree | 60eb718c7395878414aaca32201f8f6a2759ae6a /addons/base_import_module/controllers/__init__.py | |
| parent | dbd36f318c2651a76bc55c859e8b7d5b00866b33 (diff) | |
[DIRTY FIX] Fixing bizarre merge, this file should not be merged into trunk
bzr revid: rim@openerp.com-20140326090335-lm6ew2r2cx19niuz
Diffstat (limited to 'addons/base_import_module/controllers/__init__.py')
0 files changed, 0 insertions, 0 deletions