Migrations conflict fixed

breathecode/admissions/migrations/0068_merge_20241216_1552.py

@@ -0,0 +1,13 @@
+# Generated by Django 5.1.3 on 2024-12-16 15:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("admissions", "0065_alter_cohortuser_educational_status"),
+        ("admissions", "0067_alter_cohort_micro_cohorts"),
+    ]
+
+    operations = []

breathecode/registry/migrations/0054_merge_20241216_1552.py

@@ -0,0 +1,13 @@
+# Generated by Django 5.1.3 on 2024-12-16 15:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("registry", "0053_alter_asset_template_url"),
+        ("registry", "0053_assettechnology_featured_course"),
+    ]
+
+    operations = []