From a6e8527f701b9d51df36a3db5984fa540436a1ed Mon Sep 17 00:00:00 2001
From: OndraRehounek <ondra.rehounek@seznam.cz>
Date: Thu, 28 Apr 2022 14:46:53 +0200
Subject: [PATCH] aftermerge migration fix
---
....py => 0061_alter_districtarticlepage_content_and_more.py} | 4 ++--
...re.py => 0036_alter_regionarticlepage_content_and_more.py} | 4 ++--
...age_content.py => 0026_alter_uniwebarticlepage_content.py} | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
rename district/migrations/{0060_alter_districtarticlepage_content_and_more.py => 0061_alter_districtarticlepage_content_and_more.py} (98%)
rename region/migrations/{0035_alter_regionarticlepage_content_and_more.py => 0036_alter_regionarticlepage_content_and_more.py} (98%)
rename uniweb/migrations/{0025_alter_uniwebarticlepage_content.py => 0026_alter_uniwebarticlepage_content.py} (97%)
diff --git a/district/migrations/0060_alter_districtarticlepage_content_and_more.py b/district/migrations/0061_alter_districtarticlepage_content_and_more.py
similarity index 98%
rename from district/migrations/0060_alter_districtarticlepage_content_and_more.py
rename to district/migrations/0061_alter_districtarticlepage_content_and_more.py
index 803bc825..14618534 100644
--- a/district/migrations/0060_alter_districtarticlepage_content_and_more.py
+++ b/district/migrations/0061_alter_districtarticlepage_content_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.3 on 2022-04-28 09:31
+# Generated by Django 4.0.3 on 2022-04-28 12:43
import wagtail.contrib.table_block.blocks
import wagtail.core.blocks
@@ -10,7 +10,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ("district", "0059_alter_districtprogrampage_content"),
+ ("district", "0060_districthomepage_title_suffix"),
]
operations = [
diff --git a/region/migrations/0035_alter_regionarticlepage_content_and_more.py b/region/migrations/0036_alter_regionarticlepage_content_and_more.py
similarity index 98%
rename from region/migrations/0035_alter_regionarticlepage_content_and_more.py
rename to region/migrations/0036_alter_regionarticlepage_content_and_more.py
index 3b9a8aaa..2c918df4 100644
--- a/region/migrations/0035_alter_regionarticlepage_content_and_more.py
+++ b/region/migrations/0036_alter_regionarticlepage_content_and_more.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.3 on 2022-04-28 09:31
+# Generated by Django 4.0.3 on 2022-04-28 12:43
import wagtail.contrib.table_block.blocks
import wagtail.core.blocks
@@ -10,7 +10,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ("region", "0034_alter_regionprogrampage_content"),
+ ("region", "0035_regionhomepage_title_suffix"),
]
operations = [
diff --git a/uniweb/migrations/0025_alter_uniwebarticlepage_content.py b/uniweb/migrations/0026_alter_uniwebarticlepage_content.py
similarity index 97%
rename from uniweb/migrations/0025_alter_uniwebarticlepage_content.py
rename to uniweb/migrations/0026_alter_uniwebarticlepage_content.py
index a9fc245a..2e62a112 100644
--- a/uniweb/migrations/0025_alter_uniwebarticlepage_content.py
+++ b/uniweb/migrations/0026_alter_uniwebarticlepage_content.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.3 on 2022-04-28 09:31
+# Generated by Django 4.0.3 on 2022-04-28 12:43
import wagtail.core.blocks
import wagtail.core.fields
@@ -9,7 +9,7 @@ from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
- ("uniweb", "0024_alter_uniwebarticlepage_content"),
+ ("uniweb", "0025_uniwebhomepage_title_suffix"),
]
operations = [
--
GitLab