devs/profanity
2
0
Fork 0
mirror of https://git.jabber.space/devs/cproof.git synced 2026-07-29 17:06:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(merge): drop leftover <<<<<<< HEAD marker in jid_is_valid

Browse Source 
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.
This commit is contained in:
jabber.developer2
2026-05-18 12:01:32 +03:00
parent 508de43da9
commit c0f8f1a0f1
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/xmpp/jid.c
View File

@@ -79,7 +79,6 @@ jid_create(const gchar* const str)
gboolean gboolean
jid_is_valid(const gchar* const str) jid_is_valid(const gchar* const str)
{ {
<<<<<<< HEAD
if (str == NULL) { if (str == NULL) {
return FALSE; return FALSE;
} }