From 77f8b74230321000a3a34acbc060a70b466699f4 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Wed, 11 Nov 2020 08:13:18 +0100
Subject: [PATCH] Fix conflicting migrations
---
...r_group_stats.py => 0004_add_permissions_for_group_stats.py} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename aleksis/core/migrations/{0003_add_permissions_for_group_stats.py => 0004_add_permissions_for_group_stats.py} (94%)
diff --git a/aleksis/core/migrations/0003_add_permissions_for_group_stats.py b/aleksis/core/migrations/0004_add_permissions_for_group_stats.py
similarity index 94%
rename from aleksis/core/migrations/0003_add_permissions_for_group_stats.py
rename to aleksis/core/migrations/0004_add_permissions_for_group_stats.py
index 7f031fa5e..ab0e6bf5f 100644
--- a/aleksis/core/migrations/0003_add_permissions_for_group_stats.py
+++ b/aleksis/core/migrations/0004_add_permissions_for_group_stats.py
@@ -6,7 +6,7 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
- ('core', '0002_school_term'),
+ ('core', '0003_drop_image_cropping'),
]
operations = [
--
GitLab