Viewing all changes in revision 6526.4.3.
- Committer: Jelmer Vernooij
- Date: 2012-06-26 15:40:44 UTC
- mto: This revision was merged to the branch mainline in revision 6531.
- Revision ID: jelmer@samba.org-20120626154044-leofcn0n8zr68a1l
Remove conflict line.
- files modified:
- doc/en/release-notes/bzr-2.6.txt
expand all
collapse all
added
removed
