From: Graham Percival <graham@percival-music.ca>
Date: Tue, 7 Sep 2004 18:45:44 +0000 (+0000)
Subject: Fixes my bad CVS merge.
X-Git-Tag: release/2.3.15~13
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=31eef06b9a10f1e1d4b57f0359a44296cb16242f;p=lilypond.git

Fixes my bad CVS merge.
---

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index dada28ba7f..94108d0f78 100644
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -922,13 +922,6 @@ Accidentals and key signatures often confuse new users, because
 unaltered notes get natural signs depending on the key signature.  For
 more information, see @ref{More about pitches}.
 
-@c   FIXME FIXME: check CVS logs to see what was supposed to happen to this
-@c   part; CVS merge conflict occurred.
-@c @refbugs
-
-@c The ordering of a key cancellation is wrong when it is combined with
-@c repeat bar lines.  The cancellation is also printed after a line break.
-
 @seealso
 
 Program reference: @internalsref{KeyChangeEvent},