From be90f0ced3d2b7066e3fa96905c429c81e3b1e55 Mon Sep 17 00:00:00 2001
From: Tomas Gonzalez <gonzalez.tommy2001@gmail.com>
Date: Mon, 16 Dec 2024 15:53:14 +0000
Subject: [PATCH] Migrations conflict fixed

---
 .../migrations/0068_merge_20241216_1552.py          | 13 +++++++++++++
 .../registry/migrations/0054_merge_20241216_1552.py | 13 +++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 breathecode/admissions/migrations/0068_merge_20241216_1552.py
 create mode 100644 breathecode/registry/migrations/0054_merge_20241216_1552.py

diff --git a/breathecode/admissions/migrations/0068_merge_20241216_1552.py b/breathecode/admissions/migrations/0068_merge_20241216_1552.py
new file mode 100644
index 000000000..f7779d555
--- /dev/null
+++ b/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 = []
diff --git a/breathecode/registry/migrations/0054_merge_20241216_1552.py b/breathecode/registry/migrations/0054_merge_20241216_1552.py
new file mode 100644
index 000000000..4f2516fe7
--- /dev/null
+++ b/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 = []