Skip to content

Commit

Permalink
Fix compile error caused by auto merging
Browse files Browse the repository at this point in the history
TeamNewPipe#5176 changed `homeDir` from type `String` to `File`. TeamNewPipe#5059 was based on `homeDir` being a `String`. It was incorrectly auto-resolved by git.
  • Loading branch information
XiangRongLin committed Dec 15, 2020
1 parent 7e469ea commit a772337
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ class ContentSettingsManager(
private val newpipeSettings: File
) {

constructor(homeDir: String) : this(
File("$homeDir/databases/newpipe.db"),
File("$homeDir/databases/newpipe.settings")
constructor(homeDir: File) : this(
File(homeDir, "databases/newpipe.db"),
File(homeDir, "databases/newpipe.settings")
)

/**
Expand Down

0 comments on commit a772337

Please sign in to comment.