Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/db/sqlalchemy/__init__.py
« Back to merge proposal
Attempt to merge into lp:nova failed due to conflicts:
text conflict in nova/db/ sqlalchemy/ __init_ _.py