From 2a10debbd076ef3a00c025f775c03606b63cbcff Mon Sep 17 00:00:00 2001 From: Lorenz Padberg Date: Wed, 3 Aug 2022 14:44:20 +0200 Subject: [PATCH] Remove conflicting migration --- .../migrations/0012_auto_20220728_0848.py | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 server/rooms/migrations/0012_auto_20220728_0848.py diff --git a/server/rooms/migrations/0012_auto_20220728_0848.py b/server/rooms/migrations/0012_auto_20220728_0848.py deleted file mode 100644 index 7d9f65e3..00000000 --- a/server/rooms/migrations/0012_auto_20220728_0848.py +++ /dev/null @@ -1,26 +0,0 @@ -# Generated by Django 3.2.13 on 2022-07-28 08:48 - -from django.db import migrations, models -import django.db.models.deletion -import wagtail.core.blocks -import wagtail.core.fields - - -class Migration(migrations.Migration): - - dependencies = [ - ('rooms', '0011_alter_roomentry_contents'), - ] - - operations = [ - migrations.AlterField( - model_name='comment', - name='room_entry', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='comments', to='rooms.roomentry'), - ), - migrations.AlterField( - model_name='roomentry', - name='contents', - field=wagtail.core.fields.StreamField([('text_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.RichTextBlock(features=['ul', 'bold']))])), ('image_url_block', wagtail.core.blocks.StructBlock([('title', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('link_block', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock()), ('url', wagtail.core.blocks.URLBlock())])), ('document_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())])), ('subtitle', wagtail.core.blocks.StructBlock([('text', wagtail.core.blocks.TextBlock())])), ('video_block', wagtail.core.blocks.StructBlock([('url', wagtail.core.blocks.URLBlock())]))], blank=True, null=True), - ), - ]