all: upd chlog

annguyen0 · Apr 16, 2024 · 4dd9218 · 4dd9218
1 parent e126e12
commit 4dd9218
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,13 +29,10 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Fixed
 
-<<<<<<< HEAD
 - Support for link-local subnets, i.e. `fe80::/16`, in the access settings
   ([#6192]).
-=======
 - The ability to apply an invalid configuration for private RDNS, which led to
   server inoperability.
->>>>>>> master
 - Ignoring query log for clients with ClientID set ([#5812]).
 - Subdomains of `in-addr.arpa` and `ip6.arpa` containing zero-length prefix
   incorrectly considered invalid when specified for private RDNS upstream