freemodbus: fix merge issues

* Original commit: espressif/esp-idf@6e14b6265b
This commit is contained in:
aleks
2019-11-26 11:14:09 +01:00
parent 73bbc0cd7d
commit 82f7fe4d35