From: Tom Clegg <tom@curii.com>
Date: Mon, 29 Aug 2022 20:51:56 +0000 (-0400)
Subject: Fix merge conflict.
X-Git-Tag: 2.5.0~85
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6f020ee8e060d44811e92f5b3faa1b1cba876b42

Fix merge conflict.

No issue #

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

diff --git a/services/api/db/structure.sql b/services/api/db/structure.sql
index 825d5c72b0..45559757a7 100644
--- 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'),
-('20220726034131');
+('20220726034131'),
 ('20220804133317');