zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-07-29 22:16:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

updated structure.sql - resolved conflicts

Browse source
This commit is contained in:
olegphenomenon 2022-04-13 12:02:56 +03:00
parent 87e8258572
commit eef85c0fbf
1 changed files with 1 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

10
db/structure.sql
View file

@ -814,17 +814,8 @@ CREATE TABLE public.dnskeys (
updator_str character varying, updator_str character varying,
legacy_domain_id integer, legacy_domain_id integer,
updated_at timestamp without time zone, updated_at timestamp without time zone,
<<<<<<< HEAD
validation_datetime timestamp without time zone, validation_datetime timestamp without time zone,
failed_validation_reason character varying failed_validation_reason character varying
=======
<<<<<<< HEAD
validation_datetime timestamp without time zone
=======
validation_datetime timestamp without time zone,
failed_validation_reason character varying
>>>>>>> dnssec ans ns validation message
>>>>>>> dnssec ans ns validation message
); );
@ -5101,3 +5092,4 @@ INSERT INTO "schema_migrations" (version) VALUES
('20220216113112'), ('20220216113112'),
('20220228093211'), ('20220228093211'),
('20220412130856'); ('20220412130856');