Fix build

2023-01-22 10:10:54 -08:00
parent 2a9ddd10c8
commit f5e03f145c
1 changed files with 0 additions and 2 deletions
--- 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 {