From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Wed, 22 Jul 2026 09:36:06 +0000 (+0200)
Subject: Fix conflict merge fixup.
X-Git-Tag: release-1.26.0rc1~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a95bedc26f9f9381edc8532ab057361351ede2f;p=thirdparty%2Funbound.git

Fix conflict merge fixup.
---

diff --git a/services/mesh.c b/services/mesh.c
index d664e4797..6159dd1cd 100644
--- a/services/mesh.c
+++ b/services/mesh.c
@@ -2470,8 +2470,7 @@ void mesh_state_remove_reply(struct mesh_area* mesh, struct mesh_state* m,
 	while(n) {
 		if(n->query_reply.c == cp
 			&& (!h2_stream || n->h2_stream == h2_stream)
-			&& (!doq_stream || n->query_reply.doq_stream == doq_stre
-am)) {
+			&& (!doq_stream || n->query_reply.doq_stream == doq_stream)) {
 			/* unlink it */
 			if(prev) prev->next = n->next;
 			else m->reply_list = n->next;