damus

commit f5e03f145cc8706153fee2130c295284495ef524
parent 2a9ddd10c81a45f9a1f72d07c74d7b68236d1a8a
Author: William Casarin <jb55@jb55.com>
Date:   Sun, 22 Jan 2023 10:10:54 -0800

Fix build

Diffstat:
M
damus/Nostr/NostrEvent.swift
 | 
2
--

1 file changed, 0 insertions(+), 2 deletions(-)
diff --git a/damus/Nostr/NostrEvent.swift b/damus/Nostr/NostrEvent.swift
@@ -790,8 +790,6 @@ func inner_event_or_self(ev: NostrEvent) -> NostrEvent {
     return inner_ev
 }
 
-<<<<<<< HEAD
-
 func first_eref_mention(ev: NostrEvent, privkey: String?) -> Mention? {
     let blocks = ev.blocks(privkey).filter { block in
         guard case .mention(let mention) = block else {