From 6852c5e18f2940ec9081c4eedae0a1644b00b5fc Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Tue, 20 Jul 2021 08:58:57 -0600
Subject: [PATCH] fixing conflict
---
schema/versions/87dae5acfd34_.py | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
create mode 100644 schema/versions/87dae5acfd34_.py
diff --git a/schema/versions/87dae5acfd34_.py b/schema/versions/87dae5acfd34_.py
new file mode 100644
index 000000000..204f1c1a5
--- /dev/null
+++ b/schema/versions/87dae5acfd34_.py
@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: 87dae5acfd34
+Revises: 5ab2fcb61373, 10251d1732a4
+Create Date: 2021-07-20 08:58:26.887779
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '87dae5acfd34'
+down_revision = ('5ab2fcb61373', '10251d1732a4')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+ pass
+
+
+def downgrade():
+ pass
--
GitLab