From 639baaf07a0b93814a7007d9507c3b1dd1964f47 Mon Sep 17 00:00:00 2001
From: John Davis <jdavcs@gmail.com>
Date: Tue, 19 Nov 2024 11:50:35 -0500
Subject: [PATCH] Add merge migration to merge 2 heads

---
 .../alembic/versions_gxy/75348cfb3715_.py     | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 lib/galaxy/model/migrations/alembic/versions_gxy/75348cfb3715_.py

diff --git a/lib/galaxy/model/migrations/alembic/versions_gxy/75348cfb3715_.py b/lib/galaxy/model/migrations/alembic/versions_gxy/75348cfb3715_.py
new file mode 100644
index 000000000000..e031447c4bbd
--- /dev/null
+++ b/lib/galaxy/model/migrations/alembic/versions_gxy/75348cfb3715_.py
@@ -0,0 +1,21 @@
+"""Merge head revisions
+
+Revision ID: 75348cfb3715
+Revises: 9a5207190a4d, cbc46035eba0
+Create Date: 2024-11-19 11:48:02.273303
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "75348cfb3715"
+down_revision = ("9a5207190a4d", "cbc46035eba0")
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass