From 2f93d23a4fa3624304c58ec74dbcb828b8e99e3b Mon Sep 17 00:00:00 2001 From: Jonathan Mah Date: Tue, 7 Jun 2022 14:41:46 -0700 Subject: [PATCH] Fixed conflicting migration error --- testapp/migrations/{0020_timezone.py => 0022_timezone.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename testapp/migrations/{0020_timezone.py => 0022_timezone.py} (81%) diff --git a/testapp/migrations/0020_timezone.py b/testapp/migrations/0022_timezone.py similarity index 81% rename from testapp/migrations/0020_timezone.py rename to testapp/migrations/0022_timezone.py index 7cd0c42a..67e3b907 100644 --- a/testapp/migrations/0020_timezone.py +++ b/testapp/migrations/0022_timezone.py @@ -1,4 +1,4 @@ -# Generated by Django 4.0.4 on 2022-05-18 20:55 +# Generated by Django 4.0.4 on 2022-06-07 15:37 from django.db import migrations, models import django.utils.timezone @@ -7,7 +7,7 @@ class Migration(migrations.Migration): dependencies = [ - ('testapp', '0019_customer_name_customer_address'), + ('testapp', '0021_multiple_autofield_to_bigauto'), ] operations = [