From ade83d316b9032c565bdcf33a872ac6072433e98 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 22 Mar 2023 16:06:43 +1000 Subject: [PATCH] nixos/doc/rl-2305: remove stray conflict marker --- nixos/doc/manual/release-notes/rl-2305.section.md | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/doc/manual/release-notes/rl-2305.section.md b/nixos/doc/manual/release-notes/rl-2305.section.md index 37b446d2e6f2..7ba3552b4e42 100644 --- a/nixos/doc/manual/release-notes/rl-2305.section.md +++ b/nixos/doc/manual/release-notes/rl-2305.section.md @@ -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}