resolve merge

[lilypond.git] / input / regression / key-signature-cancellation-extra-natural.ly

diff --git a/input/regression/key-signature-cancellation-extra-natural.ly b/input/regression/key-signature-cancellation-extra-natural.ly
deleted file mode 100644 (file)
index 676e1dc..0000000
--- a/input/regression/key-signature-cancellation-extra-natural.ly
+++ /dev/null
@@ -1,23 +0,0 @@
-\header {
-
-  texidoc = "If @code{extraNatural} is set then keys that are not
-  altered farther away (eg from sharp to double sharp) are
-  cancelled. Otherwise only keys that do not occur in the new key
-  signature are cancelled."  }
-
-
-\version "2.12.0"
-
-\paper {
-  ragged-right = ##t
-}
-{
-  \set Staff.extraNatural = ##f
-  \key fes \major r1
-  \key as \major r1_"No B-natural (#f)"
-  \set Staff.extraNatural = ##t
-  \key gis \major r1
-  \key b \major r1_"with F-natural (#t)"
-
-}
-