From 0b70537241cfc6f27b1cad7db232027b037c8b13 Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Thu, 23 Jun 2022 12:08:34 +0200
Subject: [PATCH] Resolve migration conflict, add missing migration

---
 ....py => 0034_alter_contentblock_contents.py} |  4 ++--
 .../migrations/0031_alter_license_isbn.py      | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)
 rename server/books/migrations/{0033_alter_contentblock_contents.py => 0034_alter_contentblock_contents.py} (97%)
 create mode 100644 server/users/migrations/0031_alter_license_isbn.py

diff --git a/server/books/migrations/0033_alter_contentblock_contents.py b/server/books/migrations/0034_alter_contentblock_contents.py
similarity index 97%
rename from server/books/migrations/0033_alter_contentblock_contents.py
rename to server/books/migrations/0034_alter_contentblock_contents.py
index 4e594248..6889002e 100644
--- a/server/books/migrations/0033_alter_contentblock_contents.py
+++ b/server/books/migrations/0034_alter_contentblock_contents.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.13 on 2022-06-15 15:40
+# Generated by Django 3.2.13 on 2022-06-23 10:07
 
 import assignments.models
 from django.db import migrations
@@ -12,7 +12,7 @@ import wagtail.snippets.blocks
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('books', '0032_auto_20211213_1342'),
+        ('books', '0033_snapshot_title'),
     ]
 
     operations = [
diff --git a/server/users/migrations/0031_alter_license_isbn.py b/server/users/migrations/0031_alter_license_isbn.py
new file mode 100644
index 00000000..74b945c7
--- /dev/null
+++ b/server/users/migrations/0031_alter_license_isbn.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-06-23 10:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0030_alter_user_first_name'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='license',
+            name='isbn',
+            field=models.CharField(default='978-3-0355-2189-4', max_length=50),
+        ),
+    ]