diff options
| author | Ankita Patel (OpenERP) <pat@tinyerp.com> | 2012-07-16 11:29:14 +0530 |
|---|---|---|
| committer | Ankita Patel (OpenERP) <pat@tinyerp.com> | 2012-07-16 11:29:14 +0530 |
| commit | ed4ca43c69cc775a7e48f6907ace07cd3394af6c (patch) | |
| tree | 7729e8f4c945b87c96bed99ed2399683715051c8 /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 1b4dd5856e76b90341ac3424fd39438b23b6c7cd (diff) | |
| parent | 1e1644010b834f06a94473f1b3b1f0c80b0d8d0b (diff) | |
[IMP]hr_payroll: resolve conflicts
bzr revid: pat@tinyerp.com-20120716055914-ps31ejm29hlez34y
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions