Resolve conflicting migrations

mathesar-foundation · Oct 25, 2023 · 825a36f · 825a36f
1 parent c0b6cb3
commit 825a36f
Showing 1 changed file with 14 additions and 0 deletions.
diff --git a/mathesar/migrations/0009_merge_20231025_1733.py b/mathesar/migrations/0009_merge_20231025_1733.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.1.14 on 2023-10-25 17:33
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mathesar', '0008_auto_20230921_1834'),
+        ('mathesar', '0005_user_display_language'),
+    ]
+
+    operations = [
+    ]