From c3b922a97531265d37a2c5538831f70f4d8feedf Mon Sep 17 00:00:00 2001
From: Jacob Nesbitt <jjnesbitt2@gmail.com>
Date: Tue, 28 Jan 2025 12:58:14 -0700
Subject: [PATCH] Fix conflict in migrations

---
 .../migrations/{0014_dandisetstar.py => 0016_dandisetstar.py}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename dandiapi/api/migrations/{0014_dandisetstar.py => 0016_dandisetstar.py} (96%)

diff --git a/dandiapi/api/migrations/0014_dandisetstar.py b/dandiapi/api/migrations/0016_dandisetstar.py
similarity index 96%
rename from dandiapi/api/migrations/0014_dandisetstar.py
rename to dandiapi/api/migrations/0016_dandisetstar.py
index 6067a6b5b..bd1ae8f2f 100644
--- a/dandiapi/api/migrations/0014_dandisetstar.py
+++ b/dandiapi/api/migrations/0016_dandisetstar.py
@@ -9,7 +9,7 @@
 class Migration(migrations.Migration):
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('api', '0013_remove_assetpath_consistent_slash_and_more'),
+        ('api', '0015_unaccent_extension'),
     ]
 
     operations = [