mirror of
git://jb55.com/damus
synced 2024-09-30 00:40:45 +00:00
Merge release branch 'v1.8_relay_fix_and_video_player'
Manually fixed simple merge conflict in damus.xcodeproj/project.pbxproj
This commit is contained in:
commit
cea4922442
@ -58,7 +58,7 @@ func load_bootstrap_relays(pubkey: Pubkey) -> [RelayURL] {
|
|||||||
|
|
||||||
let relay_urls = relays.compactMap({ RelayURL($0) })
|
let relay_urls = relays.compactMap({ RelayURL($0) })
|
||||||
|
|
||||||
let loaded_relays = Array(Set(relay_urls + get_default_bootstrap_relays()))
|
let loaded_relays = Array(Set(relay_urls))
|
||||||
print("Loading custom bootstrap relays: \(loaded_relays)")
|
print("Loading custom bootstrap relays: \(loaded_relays)")
|
||||||
return loaded_relays
|
return loaded_relays
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user