Johannes Mockenhaupt b6a62dedae Fix merge conflict.		2017-10-27 22:26:47 +02:00
..
androidTest/java/info/nightscout/androidaps	Remove unused test class.	2017-08-28 00:57:47 +02:00
main	Fix merge conflict.	2017-10-27 22:26:47 +02:00
test/java/info/nightscout/utils	Revert "Rounding issues visible in nightscout insulin field"	2017-09-18 21:24:22 +02:00