Attempt to merge lp:~allenap/python-oops-tools/use-psycopg2-2.4.1 into lp:python-oops-tools failed due to merge conflicts:
text conflict in versions.cfg
« Back to merge proposal
Attempt to merge lp:~allenap/python-oops-tools/use-psycopg2-2.4.1 into lp:python-oops-tools failed due to merge conflicts:
text conflict in versions.cfg