220fd03d4a
# Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt |
||
---|---|---|
.. | ||
libs | ||
src | ||
build.gradle | ||
fabric.properties | ||
google-services.json | ||
proguard-rules.pro |
220fd03d4a
# Conflicts: # app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt |
||
---|---|---|
.. | ||
libs | ||
src | ||
build.gradle | ||
fabric.properties | ||
google-services.json | ||
proguard-rules.pro |