Merge pull request #208 from cuappdev/friends

Removed duplicate file and fixed merge migration

Author: JoshD94

migrations/versions/01234abcdef1_add_friends_table.py

@@ -1,7 +1,7 @@
 """merge branches
 
 Revision ID: 3c406131c004
-Revises: 01234abcdef1, 7a3c14648e56
+Revises: 7a3c14648e56
 Create Date: 2025-03-29 00:36:22.980924
 
 """
@@ -11,7 +11,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '3c406131c004'
-down_revision = ('01234abcdef1', '7a3c14648e56')
+down_revision = '7a3c14648e56'
 branch_labels = None
 depends_on = None