Mercurial Mercurial > Publidoc / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
Resolution de conflit
authorPatrick PIERRE <patrick.pierre@prismallia.fr>
sam., 26 mai 2012 07:40:53 +0200
changeset 107 7dd0c60e1ccb
parent 106 91000116e5d2
child 108 f8bc5e00b17f
Resolution de conflit
RelaxNG/Examples/Documents/torture_test.xml file | annotate | diff | comparison | revisions 
--- 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>
Publidoc