From 9aba312c8e4d5bfeda6873c6e98822222d24662b Mon Sep 17 00:00:00 2001
From: deepend <deepend@tilde.club>
Date: Wed, 4 Feb 2026 13:13:51 -0700
Subject: [PATCH] Resolved the merge conflict in STS capability handling by
 keeping the clearer warning message for missing values.

---
 src/common/inbound.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/common/inbound.c b/src/common/inbound.c
index 169d1689..6cb27ba3 100644
--- a/src/common/inbound.c
+++ b/src/common/inbound.c
@@ -1903,11 +1903,7 @@ inbound_cap_ls (server *serv, char *nick, char *extensions_str,
 			else
 			{
 				PrintTextf (serv->server_session,
-<<<<<<< ours
-							_("Invalid STS capability token without value"));
-=======
 							_("Invalid STS capability token without a value; ignoring."));
->>>>>>> theirs
 			}
 			continue;
 		}