mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-13 21:50:33 +03:00
nixos/doc/rl-2305: remove stray conflict marker
This commit is contained in:
parent
bf57467402
commit
ade83d316b
1 changed files with 0 additions and 1 deletions
|
@ -181,7 +181,6 @@ In addition to numerous new and upgraded packages, this release has the followin
|
|||
|
||||
- The `baget` package and module was removed due to being unmaintained.
|
||||
|
||||
>>>>>>> origin/master
|
||||
## Other Notable Changes {#sec-release-23.05-notable-changes}
|
||||
|
||||
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue