From c0f8f1a0f14f07d492b97d07e910d3b0fdb9263c Mon Sep 17 00:00:00 2001
From: "jabber.developer2" <jabber.developer2@jabber.space>
Date: Mon, 18 May 2026 12:01:32 +0300
Subject: [PATCH] fix(merge): drop leftover <<<<<<< HEAD marker in jid_is_valid

My earlier merge-resolution Edit on src/xmpp/jid.c only covered the
=======/>>>>>>> half of the hunk and left an orphan <<<<<<< HEAD on
line 82 of jid_is_valid. CI caught it. Removed.
---
 src/xmpp/jid.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/xmpp/jid.c b/src/xmpp/jid.c
index d3610da6..ccedcb3e 100644
--- a/src/xmpp/jid.c
+++ b/src/xmpp/jid.c
@@ -79,7 +79,6 @@ jid_create(const gchar* const str)
 gboolean
 jid_is_valid(const gchar* const str)
 {
-<<<<<<< HEAD
     if (str == NULL) {
         return FALSE;
     }