diff options
| author | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-08-06 11:04:47 +0530 |
|---|---|---|
| committer | Ajay Chauhan (OpenERP) <cha@tinyerp.com> | 2012-08-06 11:04:47 +0530 |
| commit | bd19887191e42f04d9c2355de6e8286012cdd330 (patch) | |
| tree | d5b9a2f3b94b66ba652d536096460babd769e6b4 /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | fe54bc7b888275eb285a585b38c877607a4412a9 (diff) | |
[IMP]account : remove conflicts
bzr revid: cha@tinyerp.com-20120806053447-shfvzo9i26xmalx1
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions