diff --git a/db/structure.sql b/db/structure.sql index 9bec3df49..1b8a59242 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -5404,6 +5404,7 @@ INSERT INTO "schema_migrations" (version) VALUES ('20220106123143'), ('20220113201642'), ('20220113220809'), +<<<<<<< HEAD ('20220124105717'), ('20220216113112'), ('20220228093211'), @@ -5413,3 +5414,14 @@ INSERT INTO "schema_migrations" (version) VALUES ('20220413084536'), ('20220413084748'), ('20220504090512'); +======= +('20220406085500'), +('20220413073315'), +('20220413084536'), +('20220413084748'), +('20220124105717'), +('20220216113112'), +('20220228093211'), +('20220316140727'), +('20220412130856'); +>>>>>>> fixed structure sql conflict