From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Thu, 5 Oct 2023 10:35:15 +0000 (+0200)
Subject: NEWS: fixup merge-conflict resolution
X-Git-Tag: v6.0.4^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae6099c7ae8f18ca54060c8c2383b6bf198de77f;p=thirdparty%2Fknot-resolver.git

NEWS: fixup merge-conflict resolution
---

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