damus

commit cea49224429516613c6e78617b231c0e9bdc1921
parent ac7d6c65c72927bd40ad44b53294d41af3e98861
Author: Daniel D’Aquino <daniel@daquino.me>
Date:   Fri,  3 May 2024 12:36:58 -0700

Merge release branch 'v1.8_relay_fix_and_video_player'

Manually fixed simple merge conflict in damus.xcodeproj/project.pbxproj

Diffstat:
M
damus/Util/Relays/RelayBootstrap.swift
 | 
2
+-

1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/damus/Util/Relays/RelayBootstrap.swift b/damus/Util/Relays/RelayBootstrap.swift
@@ -58,7 +58,7 @@ func load_bootstrap_relays(pubkey: Pubkey) -> [RelayURL] {
 
     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)")
     return loaded_relays
 }