🔀 [MERGE] Fix merge

GeotrekCE · Jan 2, 2024 · f87d00a · f87d00a
1 parent c32973a
commit f87d00a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...nce/migrations/0023_auto_20231206_1627.py → ...nce/migrations/0024_auto_20231206_1627.py b/...nce/migrations/0023_auto_20231206_1627.py → ...nce/migrations/0024_auto_20231206_1627.py
@@ -16,7 +16,7 @@ def copy_date_into_begin_date(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('maintenance', '0022_auto_20230503_0837'),
+        ('maintenance', '0023_intervention_access'),
     ]
 
     operations = [

diff --git a/...grations/0024_remove_intervention_date.py → ...grations/0025_remove_intervention_date.py b/...grations/0024_remove_intervention_date.py → ...grations/0025_remove_intervention_date.py
@@ -6,7 +6,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('maintenance', '0023_auto_20231206_1627'),
+        ('maintenance', '0024_auto_20231206_1627'),
     ]
 
     operations = [