Fix bad merge conflict "fix".

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index b5c761e530b15dfa55dbe19ffa211daa5876d103..b6bc417cfff633c995f6ecd89096a8663c7a0c40 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -256,11 +256,6 @@
 @inforef{\TEXT\,,lilypond-internals}
 @end macro
 
-@macro rglos{TEXT}
-@vindex \TEXT\
-@inforef{\TEXT\,,music-glossary}
-@end macro
-
 @macro rprogram{TEXT}
 @vindex \TEXT\
 @ref{\TEXT\,,,lilypond-program}