To get this branch, use:
bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
Viewing all changes in revision 3251.1.1.
- Committer: Jelmer Vernooij
- Date: 2008-03-05 22:36:58 UTC
- mfrom: (3250.1.1 bzr.docfix)
- mto: This revision was merged to the branch mainline in revision 3252.
- Revision ID: jelmer@samba.org-20080305223658-a9ici3oxtwyy0v11
Merge documentation fix from Martin.
- files modified:
- doc/en/user-guide/resolving_conflicts.txt
expand all
collapse all
added
removed
