deepend/zoitechat
1
0
Fork 0
mirror of https://github.com/ZoiteChat/zoitechat.git synced 2026-03-19 20:20:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved the merge conflict in STS capability handling by keeping the clearer warning message for missing values.

Browse Source
This commit is contained in:
deepend
2026-02-04 13:13:51 -07:00
parent 983ae5337b
commit 9aba312c8e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/inbound.c
View File

@@ -1903,11 +1903,7 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
else else
{ {
PrintTextf (serv->server_session, PrintTextf (serv->server_session,
<<<<<<< ours
_("Invalid STS capability token without value"));
=======
_("Invalid STS capability token without a value; ignoring.")); _("Invalid STS capability token without a value; ignoring."));
>>>>>>> theirs
} }
continue; continue;
} }