diff options
| author | Alan Somers <asomers@gmail.com> | 2021-12-20 22:42:39 -0700 |
|---|---|---|
| committer | Alan Somers <asomers@gmail.com> | 2021-12-20 23:11:25 -0700 |
| commit | 771c710e903c7176eb362fe632fb9fbf0e6f6910 (patch) | |
| tree | bbaea69b57959959e1bfae5792778cede6e3177f | |
| parent | 0b4717d3a4bf6cedf3406d58ccc369c31fc28d0e (diff) | |
| download | nix-771c710e903c7176eb362fe632fb9fbf0e6f6910.zip | |
Fix merge error in CHANGELOG
| -rw-r--r-- | CHANGELOG.md | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 46a3eff4..d935e28c 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 |