[MERGE] Small doc fix in conflict resolution

[Jelmer Vernooij]

Am Mittwoch, den 05.03.2008, 10:27 +0000 schrieb Martin Albisetti:
> Tweaked the conflict resolution explanation slightly to clarify the
> full steps needed to mark a conflict as resolved.
bb:approve

Cheers,

Jelmer
-- 
Jelmer Vernooij <jelmer at samba.org> - http://samba.org/~jelmer/
Jabber: jelmer at jabber.fsfe.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 307 bytes
Desc: Dies ist ein digital signierter Nachrichtenteil
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080305/3549aa57/attachment.pgp