[FIX] Conflicts while merging

Browse Source

...

This commit is contained in:

tbe-odoo

2017-08-29 17:24:58 +02:00

parent be650c5979 e81fa1d3fd

commit 26eaac4ed1

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

Diff Content Not Available