Attempt to merge into lp:ensoft-sextant failed due to conflicts:
text conflict in src/sextant/export.py text conflict in src/sextant/query.py text conflict in src/sextant/web/server.py
« Back to merge proposal
Attempt to merge into lp:ensoft-sextant failed due to conflicts:
text conflict in src/sextant/ export. py query.py web/server. py
text conflict in src/sextant/
text conflict in src/sextant/