From 3d681df96a6afb8f0df76aa5967326c2fd3c20da Mon Sep 17 00:00:00 2001
From: Francisco Vila <francisco.vila@hispalinux.es>
Date: Tue, 9 Jun 2009 10:40:33 +0200
Subject: [PATCH] Doc-fr: rhythms.itely, prevent conflict on further merge

Ease merging with master, by parts.
---
 Documentation/fr/user/rhythms.itely | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Documentation/fr/user/rhythms.itely b/Documentation/fr/user/rhythms.itely
index 1b5da49c1f..5295651a30 100644
--- a/Documentation/fr/user/rhythms.itely
+++ b/Documentation/fr/user/rhythms.itely
@@ -892,16 +892,16 @@ numéros de mesure.
 @cindex kirchenpausen
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{changing-form-of-multi--measure-rests.ly}
+{changing-form-of-multi-measure-rests.ly}
 
 @cindex silence multi-mesures, positionnement
 @cindex positionnement des silences multi-mesures
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{positioning-multi--measure-rests.ly}
+{positioning-multi-measure-rests.ly}
 
 @lilypondfile[verbatim,lilyquote,ragged-right,texidoc,doctitle]
-{multi--measure-rest-markup.ly}
+{multi-measure-rest-markup.ly}
 
 
 @seealso
-- 
2.39.5