Fixes migration conflict

openstax · Nov 2, 2023 · de68af6 · de68af6
1 parent 7fa4b85
commit de68af6
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/snippets/migrations/0031_merge_20231101_1313.py b/snippets/migrations/0031_merge_20231101_1313.py
@@ -0,0 +1,14 @@
+# Generated by Django 4.1.7 on 2023-11-01 18:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('snippets', '0030_alter_erratacontent_book_state'),
+        ('snippets', '0030_amazonbookblurb'),
+    ]
+
+    operations = [
+    ]