diff options
| author | Paramjit Singh Sahota <psa@tinyerp.com> | 2012-09-03 16:54:18 +0530 |
|---|---|---|
| committer | Paramjit Singh Sahota <psa@tinyerp.com> | 2012-09-03 16:54:18 +0530 |
| commit | 6aeaf40d1246d6523882b6ed0c13a6f791540ba4 (patch) | |
| tree | 71c78f92427c85caec8bec2ba9bfa9a781f3d73a /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | b7763d072d1b14e6464e950e9b54a57e2f775c76 (diff) | |
| parent | dfb82b20811d50fa273e180a1a8d8d1648d4a837 (diff) | |
[IMP] removed the conflicts.
bzr revid: psa@tinyerp.com-20120903112418-xzblsiyxs4l1xr4b
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions