Resolve merge issues

unicef · Sep 24, 2024 · 22bfbbb · 22bfbbb
1 parent ee69503
commit 22bfbbb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...ns/0004_config_deduplicationset_config.py → ...ns/0005_config_deduplicationset_config.py b/...ns/0004_config_deduplicationset_config.py → ...ns/0005_config_deduplicationset_config.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.7 on 2024-09-22 21:12
+# Generated by Django 5.0.7 on 2024-09-24 09:05
 
 import django.db.models.deletion
 from django.db import migrations, models
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ("api", "0003_remove_deduplicationset_name"),
+        ("api", "0004_remove_deduplicationset_error_and_more"),
     ]
 
     operations = [