Merge pull request #222478 from qowoz/fix-sn

nixos/doc/rl-2305: remove stray conflict marker
2023-03-22 09:08:56 +02:00
parent bf57467402 ade83d316b
commit bf60f52e20
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. -->