Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Fix compile error caused by auto merging

Browse source 
#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 5e7731f585
commit be8716c0ea
1 changed files with 3 additions and 3 deletions
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")
) )
/** /**