Rev 4617: Catch-up with bzr.dev renaming the help topic in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4617
revision-id: v.ladeuil+lp at free.fr-20100116101002-7v0veajsauph4uho
parent: v.ladeuil+lp at free.fr-20100116100335-uy1rxctdzni3cyrp
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Sat 2010-01-16 11:10:02 +0100
message:
  Catch-up with bzr.dev renaming the help topic
-------------- next part --------------
=== renamed file 'bzrlib/help_topics/es/conflicts.txt' => 'bzrlib/help_topics/es/conflict-types.txt'