resolve merge

[lilypond.git] / Documentation / user / glossary.html.in

diff --git a/Documentation/user/glossary.html.in b/Documentation/user/glossary.html.in
deleted file mode 100644 (file)
index 086c9d9..0000000
--- a/Documentation/user/glossary.html.in
+++ /dev/null
@@ -1,8 +0,0 @@
-<!meta http-equiv=refresh content="0; url='music-glossary.html'">
-
-
-<h2>Music glossary has moved</h2>
-
-The new location is: <a href='music-glossary.html'>music-glossary.html</a>.
-
-<p>Please update your links.  Sorry for the inconvenience.