[FIX] fixes weird push conflict between local and remote branch

Browse Source

bzr revid: ged@openerp.com-20140102091924-5fyo5qr339kr01z5

...

This commit is contained in:

Gery Debongnie

2014-01-02 10:19:24 +01:00

parent 1dd4f9c77a 805b3d19b9

commit d066478f10

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