diff options
| author | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-08-27 10:31:51 +0530 |
|---|---|---|
| committer | Jigar Amin - OpenERP <jam@tinyerp.com> | 2012-08-27 10:31:51 +0530 |
| commit | e79baa9e8a5759a3626c15dba76b1f03d8ecd098 (patch) | |
| tree | 923b73e231d78f6a125194ea126948fdff6bf49e /addons/web/static/src | |
| parent | 548672a2c3344ea51dc0a2e3325e158b0692bea5 (diff) | |
[FIX] resolve Conflicts reverts
bzr revid: jam@tinyerp.com-20120827050151-yinbjtladoe3vu5w
Diffstat (limited to 'addons/web/static/src')
0 files changed, 0 insertions, 0 deletions