From 24153bfe90c252dd630bc3c9ce750bf5cdd73fde Mon Sep 17 00:00:00 2001 From: Juan Carlos Duenas Date: Wed, 15 Jul 2026 15:08:07 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20merge=20conflicting=20cor?= =?UTF-8?q?e=20migration=20leaf=20nodes=20(0040/0041)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR #283 (0040_metered_usage_record) and PR #295 (0040_auto_20260623_0025 → 0041_auto_20260623_0041) both branched off 0039_userprofile, leaving two leaf nodes in the core migration graph. Add the merge migration so `migrate` has a single graph to apply. --- .../0042_merge_metered_usage_and_project_dates.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 estela-api/core/migrations/0042_merge_metered_usage_and_project_dates.py diff --git a/estela-api/core/migrations/0042_merge_metered_usage_and_project_dates.py b/estela-api/core/migrations/0042_merge_metered_usage_and_project_dates.py new file mode 100644 index 00000000..9f7871dd --- /dev/null +++ b/estela-api/core/migrations/0042_merge_metered_usage_and_project_dates.py @@ -0,0 +1,13 @@ +# Generated by Django 3.1.14 on 2026-07-15 19:30 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("core", "0040_metered_usage_record"), + ("core", "0041_auto_20260623_0041"), + ] + + operations = []