081e4ab9dc
# Conflicts: # wear/src/main/kotlin/app/aaps/wear/watchfaces/SteampunkWatchface.kt |
||
---|---|---|
.. | ||
src | ||
build.gradle | ||
google-services.json | ||
proguard-rules.pro |
081e4ab9dc
# Conflicts: # wear/src/main/kotlin/app/aaps/wear/watchfaces/SteampunkWatchface.kt |
||
---|---|---|
.. | ||
src | ||
build.gradle | ||
google-services.json | ||
proguard-rules.pro |