From 8ed6891f179044edfb5241609162607f89bb5a7a Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 10 Aug 2002 15:03:22 +0000 Subject: [PATCH] cvs conflict fix --- scm/grob-property-description.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 69e1b92165..7835edc96b 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -287,13 +287,9 @@ The alist contains the following entries: name, interfaces. ") (grob-property-description 'minimum-distance number? "minimum distance between notes and rests.") (grob-property-description 'minimum-distances list? "list of rods (ie. (OBJ . DIST) pairs).") -<<<<<<< grob-property-description.scm + (grob-property-description 'minimum-X-extent number-pair? "minimum size in X dimension, measured in staff space.") (grob-property-description 'minimum-Y-extent number-pair? "see @code{minimum-Y-extent}.") -======= -(grob-property-description 'minimum-X-extent number-pair? "minimum size in X dimension, measured in staff space.") -(grob-property-description 'minimum-Y-extent number-pair? "see @code{minimum-X-extent}.") ->>>>>>> 1.103 (grob-property-description 'minimum-length number? "try to make the Grob at least this long. -- 2.39.5