Fixed migrations merge conflict (open5e#665)

Author: calumbell

api_v2/migrations/0029_merge_20250407_1910.py

@@ -0,0 +1,14 @@
+# Generated by Django 5.1.2 on 2025-04-07 19:10
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api_v2', '0027_alter_creatureaction_parent_and_more'),
+        ('api_v2', '0028_alter_classfeature_parent'),
+    ]
+
+    operations = [
+    ]