fixed one more forgotten merge conflict

Browse source

...

This commit is contained in:

sanctum32 2015-02-03 17:01:55 +00:00 • committed by Antz

parent dcac66fdfe

commit ec3b4e101f

1 changed files with 2 additions and 2 deletions

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