From 328d005f090e7bd04435a24761071a663b14bf75 Mon Sep 17 00:00:00 2001 From: Adrienne Stilp Date: Tue, 9 Jul 2024 15:26:24 -0700 Subject: [PATCH] Redo drupal node id migrations to avoid conflict with previous merge Both this branch and a previous branch that I merged in added a 0024 migration, so Django didn't know which to apply. Delete the 0024 migration from this branch and regenerate it following the 0024 migration that was merged in. --- ...roup_drupal_node_id_and_more.py => 0025_drupal_node_id.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename gregor_django/gregor_anvil/migrations/{0024_historicalpartnergroup_drupal_node_id_and_more.py => 0025_drupal_node_id.py} (87%) diff --git a/gregor_django/gregor_anvil/migrations/0024_historicalpartnergroup_drupal_node_id_and_more.py b/gregor_django/gregor_anvil/migrations/0025_drupal_node_id.py similarity index 87% rename from gregor_django/gregor_anvil/migrations/0024_historicalpartnergroup_drupal_node_id_and_more.py rename to gregor_django/gregor_anvil/migrations/0025_drupal_node_id.py index 9d367ccb..9cc140b3 100644 --- a/gregor_django/gregor_anvil/migrations/0024_historicalpartnergroup_drupal_node_id_and_more.py +++ b/gregor_django/gregor_anvil/migrations/0025_drupal_node_id.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.11 on 2024-05-08 15:45 +# Generated by Django 4.2.13 on 2024-07-09 22:25 from django.db import migrations, models @@ -6,7 +6,7 @@ class Migration(migrations.Migration): dependencies = [ - ('gregor_anvil', '0023_resourceworkspace_add_brief_description'), + ('gregor_anvil', '0024_member_upload_groups'), ] operations = [