23cb374ab3
# Conflicts: # wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt |
||
---|---|---|
.. | ||
src | ||
build.gradle | ||
google-services.json | ||
proguard-rules.pro |
23cb374ab3
# Conflicts: # wear/src/main/java/info/nightscout/androidaps/watchfaces/CustomWatchface.kt |
||
---|---|---|
.. | ||
src | ||
build.gradle | ||
google-services.json | ||
proguard-rules.pro |