From: Graham Percival <graham@percival-music.ca>
Date: Wed, 19 Sep 2007 02:05:35 +0000 (-0700)
Subject: Fix bad merge conflict "fix".
X-Git-Tag: release/2.11.35-1~46^2~155
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=632216d2ee8a761ca1d681e7bb332c738645ea3e;p=lilypond.git

Fix bad merge conflict "fix".
---

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}