From: hanwen <hanwen>
Date: Sat, 10 Aug 2002 15:03:22 +0000 (+0000)
Subject: cvs conflict fix
X-Git-Tag: release/1.7.25~919
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c5417b523437d2e573ae8882579088395f5b9e4d;p=lilypond.git

cvs conflict fix
---

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.