From 2a7348f986f8c2c9d6419ea44f7a6b19a667c7d4 Mon Sep 17 00:00:00 2001 From: Guillaume Maudoux Date: Sat, 22 Oct 2022 23:38:50 +0200 Subject: [PATCH] Fixup merge typo --- doc/manual/src/release-notes/rl-next.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/doc/manual/src/release-notes/rl-next.md b/doc/manual/src/release-notes/rl-next.md index 9c43132d4..a08dc9c9b 100644 --- a/doc/manual/src/release-notes/rl-next.md +++ b/doc/manual/src/release-notes/rl-next.md @@ -7,5 +7,3 @@ * Error traces have been reworked to provide detailed explanations and more accurate error locations. A short excerpt of the trace is now shown by default when an error occurs. - ->>>>>>> origin/master