[MERGE] solve conflict

Browse Source

bzr revid: tfr@openerp.com-20101216110147-p0db1k0d9ltwna5z

...

This commit is contained in:

Thibault Francois

2010-12-16 12:01:47 +01:00

parent 6ab787de08

commit a5363f5d1b

1 changed files with 91 additions and 576 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

addons/crm/i18n/fr.po

+91 -576

File diff suppressed because it is too large Load Diff