# HG changeset patch
# User gpiancastelli
# Date 1250610136 -7200
# Node ID 4142ed700d56d746bcfc11183ac588b63fb8de8d
# Parent  63ef1efbac5792daa19ee3dc706a02c0bed29630
Typo.

diff -r 63ef1efbac57 -r 4142ed700d56 it/examples/tour-merge-conflict.wife.it
--- a/it/examples/tour-merge-conflict.wife.it	Tue Aug 18 17:31:11 2009 +0200
+++ b/it/examples/tour-merge-conflict.wife.it	Tue Aug 18 17:42:16 2009 +0200
@@ -1,7 +1,7 @@
 <!-- BEGIN tour-merge-conflict.wife -->
 <screen><prompt>$</prompt> <userinput>cat &gt; lettera.txt &lt;&lt;EOF</userinput>
 <prompt>></prompt> <userinput>Salve!</userinput>
-<prompt>></prompt> <userinput>Sono Mariam Abacha, la moglie dell'ex</userinput>
+<prompt>></prompt> <userinput>Sono Mariam Abacha, moglie dell'ex</userinput>
 <prompt>></prompt> <userinput>dittatore nigeriano Sani Abacha.</userinput>
 <prompt>></prompt> <userinput>EOF</userinput>
 <prompt>$</prompt> <userinput>hg add letter.txt</userinput>