Commit b157c4f
committed
Merge remote-tracking branch 'origin/master'
# Conflicts:
# androidApp/src/main/java/com/mrboomdev/awery/sources/SourcePreferences.kt
# androidApp/src/main/java/com/mrboomdev/awery/sources/cloudstream/CloudstreamSource.kt
# androidApp/src/main/java/com/mrboomdev/awery/sources/kaguya/KaguyaSource.kt
# androidApp/src/main/java/com/mrboomdev/awery/sources/lnreader/LnReaderSource.kt
# androidApp/src/main/java/com/mrboomdev/awery/sources/miru/MiruSource.kt
# shared/src/commonMain/kotlin/com/mrboomdev/awery/ui/screens/player/PlayerViewModel.ktFile tree
1 file changed
+1
-2
lines changed- androidApp/src/main/java/com/mrboomdev/awery/ui/tv/components
1 file changed
+1
-2
lines changedLines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | 2 | | |
3 | | - | |
4 | | - | |
| 3 | + | |
0 commit comments