From 632216d2ee8a761ca1d681e7bb332c738645ea3e Mon Sep 17 00:00:00 2001
From: Graham Percival <graham@percival-music.ca>
Date: Tue, 18 Sep 2007 19:05:35 -0700
Subject: [PATCH] Fix bad merge conflict "fix".

---
 Documentation/user/macros.itexi | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index b5c761e530..b6bc417cff 100644
--- 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}
-- 
2.39.5