From f3e92fc2e186bf7daa2e88d5ccf1c7c71764243e Mon Sep 17 00:00:00 2001
From: gregor <gregor.schulz@holi.social>
Date: Wed, 26 Mar 2025 14:55:07 +0100
Subject: [PATCH] merge conflicting migrations
---
.../migrations/0037_merge_20250326_1344.py | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 openbook_auth/migrations/0037_merge_20250326_1344.py
diff --git a/openbook_auth/migrations/0037_merge_20250326_1344.py b/openbook_auth/migrations/0037_merge_20250326_1344.py
new file mode 100644
index 000000000..e22a81fa4
--- /dev/null
+++ b/openbook_auth/migrations/0037_merge_20250326_1344.py
@@ -0,0 +1,13 @@
+# Generated by Django 5.1.7 on 2025-03-26 12:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ("openbook_auth", "0036_merge_20250311_1255"),
+ ("openbook_auth", "0036_rename_userprofile_id_user_openbook_au_id_773856_idx"),
+ ]
+
+ operations = []
--
GitLab