diff --git a/accounts/migrations/0013_merge_eventify_id.py b/accounts/migrations/0013_merge_eventify_id.py new file mode 100644 index 0000000..e566742 --- /dev/null +++ b/accounts/migrations/0013_merge_eventify_id.py @@ -0,0 +1,13 @@ +from django.db import migrations + + +class Migration(migrations.Migration): + """Merge migration to resolve conflicting eventify_id migrations.""" + + dependencies = [ + ('accounts', '0011_user_eventify_id'), + ('accounts', '0012_user_eventify_id'), + ] + + operations = [ + ]