resolved merge conflicts

Browse Source

...

This commit is contained in:

Jake Dahl

2018-08-02 23:46:36 +02:00

committed by Lorenz Meier

parent 79ba6b0d39

commit 3f550bf408

5 changed files with 1409 additions and 764 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

src/drivers/batt_smbus/batt_smbus.cpp

+424 -764

File diff suppressed because it is too large Load Diff