projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee5443f)
Fix merge conflict.
authorTom Clegg <tom@curii.com>
Mon, 29 Aug 2022 20:51:56 +0000 (16:51 -0400)
committerTom Clegg <tom@curii.com>
Mon, 29 Aug 2022 21:33:50 +0000 (17:33 -0400)
No issue #

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

services/api/db/structure.sql patch | blob | history

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 825d5c72b0f0d4ef694f65dd61c41f31cbcd3a88..45559757a7c1352ec1617e7dee1ba2e91d409a57 100644 (file)
--- a/services/api/db/structure.sql
+++ b/services/api/db/structure.sql
@@ -3184,6 +3184,6 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20220303204419'),
 ('20220401153101'),
 ('20220505112900'),
 ('20220303204419'),
 ('20220401153101'),
 ('20220505112900'),
-('20220726034131');
+('20220726034131'),
 ('20220804133317');
 
 ('20220804133317');