Skip to content

Commit b157c4f

Browse files
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.kt
2 parents 2bf1b2e + fbd7d24 commit b157c4f

File tree

1 file changed

+1
-2
lines changed
  • androidApp/src/main/java/com/mrboomdev/awery/ui/tv/components

1 file changed

+1
-2
lines changed
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
package com.mrboomdev.awery.ui.tv.components
22

3-
class TvSetting {
4-
}
3+
class TvSetting

0 commit comments

Comments
 (0)