Rev 4613: Put the spanish conflict help topic in the right place in file:///home/vila/src/bzr/experimental/conflict-manager/

[Vincent Ladeuil]

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

------------------------------------------------------------
revno: 4613
revision-id: v.ladeuil+lp at free.fr-20100104143017-atb9hcn7i4ryc51a
parent: v.ladeuil+lp at free.fr-20100104141950-21cs1d7j10ow8tp3
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup
timestamp: Mon 2010-01-04 15:30:17 +0100
message:
  Put the spanish conflict help topic in the right place
-------------- next part --------------
=== added directory 'bzrlib/help_topics/es'
=== renamed file 'doc/es/user-guide/resolving_conflicts.txt' => 'bzrlib/help_topics/es/conflicts.txt'