2026-05-26 17:54:34 +00:00
303 changed files with 10889 additions and 9770 deletions
--- 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;
    }