fix merge error

Browse Source

Origin commit data
------------------
Branch: master
Commit: b3e026fa59
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-11-14 (Tue, 14 Nov 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit

...

This commit is contained in:

Jacek Jendrzej

2017-11-14 15:13:13 +01:00

committed by max_10

parent 1b36e4aab0

commit e59e0b53a0

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