From ae6099c7ae8f18ca54060c8c2383b6bf198de77f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 5 Oct 2023 12:35:15 +0200 Subject: [PATCH] NEWS: fixup merge-conflict resolution --- NEWS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 47a01f28c..ce91b3800 100644 --- a/NEWS +++ b/NEWS @@ -7,7 +7,7 @@ Improvements - 6.0.x versions are dedicated to alpha cycle -Knot Resolver 5.7.0 (2023-0m-dd) +Knot Resolver 5.7.0 (2023-08-22) ================================ Security -- 2.47.2