resolved merge conflict

Browse Source

Signed-off-by: Daniel Menet <membership@sontags.ch>

...

This commit is contained in:

Daniel Menet

2014-08-16 14:29:15 +02:00

parent 283fba4821 94c52da6c0

commit 2019191a21

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