tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge release branch 'v1.8_relay_fix_and_video_player'

Browse Source 
Manually fixed simple merge conflict in damus.xcodeproj/project.pbxproj
This commit is contained in:
Daniel D’Aquino
2024-05-03 12:36:58 -07:00
parent ac7d6c65c7 669a313f92
commit cea4922442
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
damus/Util/Relays/RelayBootstrap.swift
View File

@@ -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
} }