]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
NEWS: fixup merge-conflict resolution
authorVladimír Čunát <vladimir.cunat@nic.cz>
Thu, 5 Oct 2023 10:35:15 +0000 (12:35 +0200)
committerVladimír Čunát <vladimir.cunat@nic.cz>
Thu, 5 Oct 2023 10:35:15 +0000 (12:35 +0200)
commitae6099c7ae8f18ca54060c8c2383b6bf198de77f
tree8a5daa1662bb5e4da0ff8a16e9339b82c83a6fce
parentf48c7f9b69d9bd64f75c7be60855d2b3539f8d3d
NEWS: fixup merge-conflict resolution
NEWS