[svnbook] r5587 committed - branches/1.8/fr/book

[chris-nanteuil at users.sourceforge.net]

Revision: 5587
          http://sourceforge.net/p/svnbook/source/5587
Author:   chris-nanteuil
Date:     2018-01-16 22:05:07 +0000 (Tue, 16 Jan 2018)
Log Message:
-----------
[fr] Following English version.
Nothing to do.

Modified Paths:
--------------
    branches/1.8/fr/book/ch02-basic-usage.xml

Property Changed:
----------------
    branches/1.8/fr/book/
    branches/1.8/fr/book/ch02-basic-usage.xml

Index: branches/1.8/fr/book
===================================================================
--- branches/1.8/fr/book	2018-01-15 11:48:18 UTC (rev 5586)
+++ branches/1.8/fr/book	2018-01-16 22:05:07 UTC (rev 5587)

Property changes on: branches/1.8/fr/book
___________________________________________________________________
Modified: svn:mergeinfo
## -1 +1 ##
-/trunk/en/book:5065-5576
\ No newline at end of property
+/trunk/en/book:5065-5586
\ No newline at end of property
Modified: branches/1.8/fr/book/ch02-basic-usage.xml
===================================================================
--- branches/1.8/fr/book/ch02-basic-usage.xml	2018-01-15 11:48:18 UTC (rev 5586)
+++ branches/1.8/fr/book/ch02-basic-usage.xml	2018-01-16 22:05:07 UTC (rev 5587)
@@ -2581,7 +2581,7 @@
         repository.  One marked with
         <computeroutput>G</computeroutput> had local changes to begin
         with, but the changes coming from the repository didn't
-        overlap with those local changes.</para>
+        conflict with those local changes.</para>
 -->
       <para>Les codes <computeroutput>U</computeroutput> (qui veut dire
         <quote>mis à jour</quote>, <foreignphrase>updated</foreignphrase>


Property changes on: branches/1.8/fr/book/ch02-basic-usage.xml
___________________________________________________________________
Modified: svn:mergeinfo
## -1,3 +1,3 ##
 /branches/1.5/fr/book/ch02-basic-usage.xml:3977-5076
-/trunk/en/book/ch02-basic-usage.xml:5065-5557
+/trunk/en/book/ch02-basic-usage.xml:5065-5586
 /trunk/src/fr/book/ch02-basic-usage.xml:3306-3976
\ No newline at end of property