diff options
| author | Thibault Delavallée <tde@openerp.com> | 2012-06-25 10:59:23 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2012-06-25 10:59:23 +0200 |
| commit | a5889f97b771e06d057ec7a779d8f37df5f8ba84 (patch) | |
| tree | 3600a5bf3ceb44b4ffa29cb40546e5840ccc305f /addons/web/doc/module/static/src/css/web_example.css.1.diff | |
| parent | 6b0c9da3593a1d94a3ade68a764082121cc911a5 (diff) | |
[FIX] crm_phonecall_view: removed a merge-source line coming from merge conflict. Damn you ol' man bzr diff
bzr revid: tde@openerp.com-20120625085923-wp4ulcsix2fhjt1g
Diffstat (limited to 'addons/web/doc/module/static/src/css/web_example.css.1.diff')
0 files changed, 0 insertions, 0 deletions