zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-30 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

fixed structure sql conflict

Browse source
This commit is contained in:
olegphenomenon 2022-04-13 12:53:03 +03:00
parent 373e333c9d
commit 94302aaec9
1 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

12
db/structure.sql
View file

@ -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