← 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: 2010-05-01 04:34:55 UTC
  • mfrom: (5121.2.5 unused-imports)
  • Revision ID: pqm@pqm.ubuntu.com-20100501043455-hc1xylhnwoemafbx
(Jelmer) Remove unused imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
18
18
# point down
19
19
 
20
20
import os
21
 
import re
22
21
 
23
22
from bzrlib.lazy_import import lazy_import
24
23
lazy_import(globals(), """