← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-27 00:22:26 UTC
  • mfrom: (5904.1.2 cleanup)
  • Revision ID: pqm@pqm.ubuntu.com-20110527002226-47nfzevxy52b4pn1
(vila) Fix some imports and other pyflakes failures. (Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
25
25
 
26
26
from bzrlib import (
27
27
    cleanup,
28
 
    commands,
29
28
    errors,
30
29
    osutils,
31
30
    rio,
35
34
    )
36
35
""")
37
36
from bzrlib import (
 
37
    commands,
38
38
    option,
39
39
    registry,
40
40
    )