~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_conflicts.py

Remove spurious import.

Show diffs side-by-side

added added

removed removed

Lines of Context:
22
22
    conflicts,
23
23
    errors,
24
24
    tests,
25
 
    workingtree,
26
25
    )
27
26
from bzrlib.tests import script
28
27