Merge pull request #207 from cuappdev/friends

Added merging migration

Author: JoshD94

migrations/versions/3c406131c004_merge_branches.py

@@ -0,0 +1,24 @@
+"""merge branches
+
+Revision ID: 3c406131c004
+Revises: 01234abcdef1, 7a3c14648e56
+Create Date: 2025-03-29 00:36:22.980924
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '3c406131c004'
+down_revision = ('01234abcdef1', '7a3c14648e56')
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    pass
+
+
+def downgrade():
+    pass