Merge pull request #336 from marc1706/ticket/335

Browse Source

[ticket/335] Resolve merge conflicts when merging master into develop

...

This commit is contained in:

Marc Alexander committed 2014-08-20 23:45:12 +02:00

2 parents a05ffcba13 ec858672d2

commit d81fc02ddb

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