Skip to content

Commit dd35803

Browse files
committed
chore: resolve migration conflicts
1 parent b37b43b commit dd35803

File tree

4 files changed

+4
-29
lines changed

4 files changed

+4
-29
lines changed

ami/main/migrations/0060_alter_sourceimagecollection_method.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
class Migration(migrations.Migration):
77
dependencies = [
8-
("main", "0059_alter_project_options"),
8+
("main", "0058_alter_project_options"),
99
]
1010

1111
operations = [

ami/main/migrations/0061_merge_20250709_0024.py

Lines changed: 0 additions & 12 deletions
This file was deleted.

ami/main/migrations/0059_delete_deprecated_permissions.py renamed to ami/main/migrations/0067_delete_deprecated_permissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def delete_deprecated_permissions(apps, schema_editor):
2323
class Migration(migrations.Migration):
2424

2525
dependencies = [
26-
("main", "0058_alter_project_options_squashed_0067_alter_project_options"),
26+
("main", "0066_alter_project_feature_flags_and_more"),
2727
]
2828

2929
operations = [
Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,11 @@
1-
# Generated by Django 4.2.10 on 2025-07-07 10:41
1+
# Generated by Django 4.2.10 on 2025-08-14 21:11
22

33
from django.db import migrations
44

55

66
class Migration(migrations.Migration):
7-
replaces = [
8-
("main", "0058_alter_project_options"),
9-
("main", "0059_alter_project_options"),
10-
("main", "0060_alter_project_options"),
11-
("main", "0061_alter_project_options"),
12-
("main", "0062_alter_project_options"),
13-
("main", "0063_alter_project_options"),
14-
("main", "0064_alter_project_options"),
15-
("main", "0065_alter_project_options"),
16-
("main", "0066_alter_project_options"),
17-
("main", "0067_alter_project_options"),
18-
]
19-
207
dependencies = [
21-
("main", "0057_merge_20250220_0022"),
8+
("main", "0067_delete_deprecated_permissions"),
229
]
2310

2411
operations = [

0 commit comments

Comments
 (0)