Merge pull request #817 from chaos-genius/fix/migrations-jsonb-merge

fix(migrations): merge diverged branches

migrations/versions/4c40273b1dea_.py

@@ -0,0 +1,24 @@
+"""empty message
+
+Revision ID: 4c40273b1dea
+Revises: 94a4f2c2b63a, 591a00900af9
+Create Date: 2022-03-11 14:57:43.755195
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '4c40273b1dea'
+down_revision = ('94a4f2c2b63a', '591a00900af9')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass