Fix merge conflict with master branch

Browse source

Signed-off-by: Paul Campbell <pcampbell@kemitix.net>

...

This commit is contained in:

Paul Campbell 2016-05-09 11:45:10 +01:00

parent 813db80045 c31fca12d7

commit d9c71f9756

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

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available