From 539484aba348798b644335a46002dab5b15806dd Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Sun, 23 May 2021 22:11:05 +0200
Subject: [PATCH] Fix conflicting migrations
---
.../{0007_unique_constraints.py => 0008_unique_constraints.py} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename aleksis/apps/chronos/migrations/{0007_unique_constraints.py => 0008_unique_constraints.py} (98%)
diff --git a/aleksis/apps/chronos/migrations/0007_unique_constraints.py b/aleksis/apps/chronos/migrations/0008_unique_constraints.py
similarity index 98%
rename from aleksis/apps/chronos/migrations/0007_unique_constraints.py
rename to aleksis/apps/chronos/migrations/0008_unique_constraints.py
index 754c3ae1..03f9a2cb 100644
--- a/aleksis/apps/chronos/migrations/0007_unique_constraints.py
+++ b/aleksis/apps/chronos/migrations/0008_unique_constraints.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('chronos', '0006_indexes'),
+ ('chronos', '0007_more_permissions'),
]
operations = [
--
GitLab