← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/code/interfaces/branchmergequeue.py

  • Committer: Curtis Hovey
  • Date: 2011-12-24 17:09:12 UTC
  • mfrom: (14600.1.12 apocalypta-1)
  • mto: This revision was merged to the branch mainline in revision 14602.
  • Revision ID: curtis.hovey@canonical.com-20111224170912-e1h1863jnphaqt81
merged apocalypta.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/code/interfaces/branchmergequeue.py
31
31
    TextLine,
32
32
    )
33
33
 
34
 
from canonical.launchpad import _
 
34
from lp import _
35
35
from lp.app.interfaces.launchpad import ILaunchpadCelebrities
36
36
from lp.services.fields import (
37
37
    PersonChoice,