Viewing all changes in revision 3252.
- Committer: Canonical.com Patch Queue Manager
- Date: 2008-03-06 00:27:06 UTC
- mfrom: (3251.1.1 bzr.dev)
- Revision ID: pqm@pqm.ubuntu.com-20080306002706-0ahjg0eqnxh8ofas
Small doc fix in conflict resolution. (Martin Albisetti)
- files modified:
- doc/en/user-guide/resolving_conflicts.txt
expand all
collapse all
added
removed
