Rodrigo Quelca 5011ba6b76 fix merge conflicts

2020-12-18 19:28:38 +00:00

..

create-db.sql

…

insert.sql

fix merge conflicts

2020-12-18 19:28:38 +00:00

schema.sql

fix merge conflicts

2020-12-18 19:28:38 +00:00

sqldb.map

…