Fix incorrect merge in battery_unittest
tree2fb9aa962030d13dfb943e5054d7663ac4bdfc0d
-rw-r--r-- 152 .gitattributes
-rw-r--r-- 171 .gitignore
-rwxr-xr-x 161 .travis.sh
-rw-r--r-- 933 .travis.yml
-rw-r--r-- 2308 CONTRIBUTING.md
-rwxr-xr-x 542 JLinkSettings.ini
-rw-r--r-- 35147 LICENSE
-rw-r--r-- 18220 Makefile
-rw-r--r-- 397 Notes.md
-rw-r--r-- 5751 README.md
-rwxr-xr-x 1043 build_docs.sh
drwxr-xr-x - docs
drwxr-xr-x - lib
drwxr-xr-x - src
drwxr-xr-x - support