Skip to content
Snippets Groups Projects
Commit f471bef2 authored by Štěpán Farka's avatar Štěpán Farka Committed by jan.bednarik
Browse files

[FIX] conflict migrations

parent 2b883b87
No related branches found
No related tags found
2 merge requests!550Release,!542[ADD] footer person list
# Generated by Django 4.0.4 on 2022-06-01 09:18 # Generated by Django 4.0.4 on 2022-06-08 07:58
import wagtail.core.blocks import wagtail.core.blocks
import wagtail.core.fields import wagtail.core.fields
import wagtail.images.blocks
from django.db import migrations from django.db import migrations
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("district", "0079_alter_districtarticlepage_content_and_more"), ("district", "0082_districtgeofeaturedetailpage_parts_section_title"),
] ]
operations = [ operations = [
......
# Generated by Django 4.0.4 on 2022-06-01 09:18 # Generated by Django 4.0.4 on 2022-06-08 08:00
from django.db import migrations from django.db import migrations
from wagtail.core.blocks import StreamValue from wagtail.core.blocks import StreamValue
...@@ -90,7 +90,7 @@ def forwards(apps, schema_editor): ...@@ -90,7 +90,7 @@ def forwards(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("district", "0080_districthomepage_footer_person_list"), ("district", "0083_districthomepage_footer_person_list"),
] ]
operations = [ operations = [
......
# Generated by Django 4.0.4 on 2022-06-02 14:33 # Generated by Django 4.0.4 on 2022-06-08 08:05
import wagtail.core.blocks import wagtail.core.blocks
import wagtail.core.fields import wagtail.core.fields
...@@ -58,7 +58,7 @@ def backwards(apps, schema_editor): ...@@ -58,7 +58,7 @@ def backwards(apps, schema_editor):
class Migration(migrations.Migration): class Migration(migrations.Migration):
dependencies = [ dependencies = [
("district", "0082_alter_districtcenterpage_sidebar_content_and_more"), ("district", "0085_alter_districtcenterpage_sidebar_content_and_more"),
] ]
operations = [ operations = [
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment