From eef85c0fbfde3348958761220362e72444e2c81e Mon Sep 17 00:00:00 2001 From: olegphenomenon Date: Wed, 13 Apr 2022 12:02:56 +0300 Subject: [PATCH] updated structure.sql - resolved conflicts --- db/structure.sql | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/db/structure.sql b/db/structure.sql index 5711ced26..f6f906d17 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -814,17 +814,8 @@ CREATE TABLE public.dnskeys ( updator_str character varying, legacy_domain_id integer, updated_at timestamp without time zone, -<<<<<<< HEAD validation_datetime timestamp without time zone, 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'), ('20220228093211'), ('20220412130856'); +