Rev 4664: Fix typo in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/experimental/conflict-manager/

------------------------------------------------------------
revno: 4664
revision-id: v.ladeuil+lp at free.fr-20100116100255-9u8xfex8x86xob0a
parent: v.ladeuil+lp at free.fr-20100106112859-bsqzmnwzntlc8nq3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: description
timestamp: Sat 2010-01-16 11:02:55 +0100
message:
  Fix typo
-------------- next part --------------
=== modified file 'bzrlib/help_topics/en/conflicts.txt'
--- a/bzrlib/help_topics/en/conflicts.txt	2010-01-05 15:55:47 +0000
+++ b/bzrlib/help_topics/en/conflicts.txt	2010-01-16 10:02:55 +0000
@@ -234,7 +234,7 @@
 - ``--action=done`` will just mark the conflict as resolved.
 
 Bazaar cannot auto-detect when conflicts of this kind have been resolved.
-.. TODO: Arguably any state is valid after the merge so we bzr can just
+.. TODO: Arguably any state is valid after the merge so bzr can just
 consider the conflict as resolved.
 
 Deleting parent