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