Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog text conflict in src/store/naive/simple_store.cpp
« Back to merge proposal
Attempt to merge into lp:zorba failed due to conflicts:
text conflict in ChangeLog naive/simple_ store.cpp
text conflict in src/store/