From e4c31790d5012032f484a97d05b4a357ae37873f Mon Sep 17 00:00:00 2001
From: Alan Somers <asomers@gmail.com>
Date: Mon, 20 Dec 2021 22:42:39 -0700
Subject: [PATCH] Fix merge error in CHANGELOG

---
 CHANGELOG.md | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 46a3eff4b2..d935e28c5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/).
 
+## [Unreleased] - ReleaseDate
+### Added
+
+- Added fine-grained features flags.  Most Nix functionality can now be
+  conditionally enabled.  By default, all features are enabled.
+  (#[1611](https://github.com/nix-rust/nix/pull/1611))
+
+### Changed
+### Fixed
+### Removed
+
 ## [0.23.1] - 2021-12-16
 
 ### Added
@@ -20,17 +31,6 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   `0..FD_SETSIZE`.
   (#[1575](https://github.com/nix-rust/nix/pull/1575))
 
-## [Unreleased] - ReleaseDate
-### Added
-
-- Added fine-grained features flags.  Most Nix functionality can now be
-  conditionally enabled.  By default, all features are enabled.
-  (#[1498](https://github.com/nix-rust/nix/pull/1498))
-
-### Changed
-### Fixed
-### Removed
-
 ## [0.23.0] - 2021-09-28
 ### Added