Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix compile error caused by auto merging 

#5176 changed `homeDir` from type `String` to `File`. #5059 was based on `homeDir` being a `String`. It was incorrectly auto-resolved by git.
This commit is contained in:
XiangRongLin 2020-12-15 20:18:25 +01:00
parent 7e469ead45
commit a7723373a0
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/org/schabi/newpipe/settings/ContentSettingsManager.kt
View File

@ -15,9 +15,9 @@ class ContentSettingsManager(
private val newpipeSettings: File private val newpipeSettings: File
) { ) {
constructor(homeDir: String) : this( constructor(homeDir: File) : this(
File("$homeDir/databases/newpipe.db"), File(homeDir, "databases/newpipe.db"),
File("$homeDir/databases/newpipe.settings") File(homeDir, "databases/newpipe.settings")
) )
/** /**