# HG changeset patch
# User Patrick PIERRE <patrick.pierre@prismallia.fr>
# Date 1338010853 -7200
# Node ID 7dd0c60e1ccb1dd5c8e6e14db69cf8082df20e3d
# Parent  91000116e5d256149a020ee74e4533d2a0e95682
Resolution de conflit

diff -r 91000116e5d2 -r 7dd0c60e1ccb RelaxNG/Examples/Documents/torture_test.xml
--- a/RelaxNG/Examples/Documents/torture_test.xml	ven. mai 25 12:48:29 2012 +0200
+++ b/RelaxNG/Examples/Documents/torture_test.xml	sam. mai 26 07:40:53 2012 +0200
@@ -423,7 +423,7 @@
         <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
         <topic>
           <head>
-            <title>Musiques et sons</title>
+            <title>La musique et le son</title>
           </head>
           <section>
             <media>