From b8a69ceae2c7b2397bb12a9b272ca1cf7b597825 Mon Sep 17 00:00:00 2001 From: Sicherhaven Date: Mon, 6 Apr 2026 12:30:49 +0530 Subject: [PATCH] fix(accounts): add merge migration to resolve conflicting eventify_id migrations 0011_user_eventify_id and 0012_user_eventify_id both added eventify_id field from different base migrations. Created 0013 merge node to unify the graph. --- accounts/migrations/0013_merge_eventify_id.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 accounts/migrations/0013_merge_eventify_id.py 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 = [ + ]