From 47ff274d429724216b81dfe4839a5e36bb232dc1 Mon Sep 17 00:00:00 2001
From: chausman <chausman@nrao.edu>
Date: Thu, 15 Jul 2021 10:22:51 -0600
Subject: [PATCH] fix head conflict

---
 schema/versions/a70e3e5d5bf3_.py | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 schema/versions/a70e3e5d5bf3_.py

diff --git a/schema/versions/a70e3e5d5bf3_.py b/schema/versions/a70e3e5d5bf3_.py
new file mode 100644
index 000000000..12c696fb5
--- /dev/null
+++ b/schema/versions/a70e3e5d5bf3_.py
@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: a70e3e5d5bf3
+Revises: 0bca0d8b3564, 7200d0d19938
+Create Date: 2021-07-15 10:22:22.651390
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = 'a70e3e5d5bf3'
+down_revision = ('0bca0d8b3564', '7200d0d19938')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass
-- 
GitLab