From 8feebf8e5ac0cd8115326e68ddd4fc59eb67a1e1 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 7 Jul 2023 02:32:42 -0400
Subject: [PATCH] fix migration merge

---
 users/migrations/0007_username_case_insensitive.py      | 2 +-
 users/migrations/0008_user_at_least_one_login_method.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/users/migrations/0007_username_case_insensitive.py b/users/migrations/0007_username_case_insensitive.py
index 3bc7c4e6..a54cc55b 100644
--- a/users/migrations/0007_username_case_insensitive.py
+++ b/users/migrations/0007_username_case_insensitive.py
@@ -6,7 +6,7 @@ import django.db.models.functions.text
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("users", "0006_unique_email"),
+        ("users", "0007_user_pending_email"),
     ]
 
     operations = [
diff --git a/users/migrations/0008_user_at_least_one_login_method.py b/users/migrations/0008_user_at_least_one_login_method.py
index 535e02c0..c346176e 100644
--- a/users/migrations/0008_user_at_least_one_login_method.py
+++ b/users/migrations/0008_user_at_least_one_login_method.py
@@ -5,7 +5,7 @@ from django.db import migrations, models
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("users", "0007_user_pending_email"),
+        ("users", "0007_username_case_insensitive"),
     ]
 
     operations = [