~loggerhead-team/loggerhead/trunk-rich

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Matt Nordhoff
  • Date: 2009-10-21 10:51:40 UTC
  • mfrom: (389.2.7 pep8-2009-10)
  • mto: This revision was merged to the branch mainline in revision 406.
  • Revision ID: mnordhoff@mattnordhoff.com-20091021105140-wg0am6fp92i3cg2e
Merge pep8-2009-10, fixing conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
 
39
39
    require_any_api(bzrlib, [
40
40
        (1, 13, 0), (1, 15, 0), (1, 16, 0), (1, 17, 0), (1, 18, 0),
41
 
        (2, 0, 0), (2, 1, 0), (2, 2, 0)])
 
41
        (2, 0, 0), (2, 1, 0)])
42
42
 
43
43
    # NB: Normally plugins should lazily load almost everything, but this
44
44
    # seems reasonable to have in-line here: bzrlib.commands and options are