Viewing all changes in revision 4597.3.24.
- Committer: Vincent Ladeuil
- Date: 2009-10-16 13:25:37 UTC
- mto: (4597.3.66 dont-add-conflict-helpers) (5008.1.1 integration)
- mto: This revision was merged to the branch mainline in revision 5009.
- Revision ID: v.ladeuil+lp@free.fr-20091016132537-c70i3b2uxyoth0hc
Fix imports in bzrlib/conflicts.py.
- files modified:
- bzrlib/conflicts.py
expand all
collapse all
added
removed
