Fix merge conflict errors

This commit is contained in:
ronaldheft
2022-08-14 18:22:50 -04:00
parent 934a07a5ad
commit 4c8217edf6
7 changed files with 48 additions and 105 deletions
+1 -1
View File
@@ -133,7 +133,7 @@ class LocalPodcastEpisode: Object, Codable {
class LocalFile: Object, Codable {
@Persisted(primaryKey: true) var id: String = UUID().uuidString
@Persisted var filename: String?
@Persisted var contentUrl: String = ""
@Persisted var _contentUrl: String = ""
@Persisted var mimeType: String?
@Persisted var size: Int = 0