fix: upstream conflict.

Signed-off-by: KaiserBh <kaiserbh@proton.me>
This commit is contained in:
KaiserBh
2023-11-19 19:34:37 +11:00
340 changed files with 5963 additions and 6352 deletions

View File

@@ -1,5 +1,6 @@
[versions]
aboutlib_version = "10.9.2"
moko = "0.23.0"
okhttp_version = "5.0.0-alpha.11"
shizuku_version = "12.2.0"
sqlite = "2.4.0"
@@ -62,6 +63,9 @@ compose-materialmotion = "io.github.fornewid:material-motion-compose-core:1.1.0"
swipe = "me.saket.swipe:swipe:1.2.0"
moko-core = { module = "dev.icerock.moko:resources", version.ref = "moko" }
moko-gradle = { module = "dev.icerock.moko:resources-generator", version.ref = "moko" }
logcat = "com.squareup.logcat:logcat:0.1"
acra-http = "ch.acra:acra-http:5.11.3"