From 31764f8a7f6624c4dafa13dbb58ea1b21c298a8e Mon Sep 17 00:00:00 2001 From: Iggy Eom Date: Thu, 20 Jul 2023 13:29:22 -0700 Subject: [PATCH] Fix migration conflicts. --- .../0008_alter_user_username_max_length.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 django/contrib/auth/migrations/0008_alter_user_username_max_length.py diff --git a/django/contrib/auth/migrations/0008_alter_user_username_max_length.py b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py new file mode 100644 index 000000000000..cbc2a0a39db5 --- /dev/null +++ b/django/contrib/auth/migrations/0008_alter_user_username_max_length.py @@ -0,0 +1,13 @@ +from django.contrib.auth import validators +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('auth', '0007_alter_user_username_max_length'), + ] + + operations = [ + # Dummy migration file to make minimal conflict with upstream. + ]