From 880991984f50bee25cd7d5480744e064af73a5dc Mon Sep 17 00:00:00 2001
From: jorgepastorr <jorgepastorr@gmail.com>
Date: Sun, 26 Nov 2023 11:31:07 +0100
Subject: [PATCH] merge migrations

---
 .gitignore                                         |  3 +++
 .../migrations/0005_merge_20231126_1052.py         | 14 ++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 orchestra/contrib/systemusers/migrations/0005_merge_20231126_1052.py

diff --git a/.gitignore b/.gitignore
index c6d1a57c..4c475d0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,6 @@ build
 /.Trash*
 /.git
 /.idea
+
+.idea
+.Trash-1000/
diff --git a/orchestra/contrib/systemusers/migrations/0005_merge_20231126_1052.py b/orchestra/contrib/systemusers/migrations/0005_merge_20231126_1052.py
new file mode 100644
index 00000000..60f45ba1
--- /dev/null
+++ b/orchestra/contrib/systemusers/migrations/0005_merge_20231126_1052.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.28 on 2023-11-26 09:52
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('systemusers', '0002_auto_20150429_1413_squashed_0004_auto_20210330_1049'),
+        ('systemusers', '0004_auto_20230813_0920'),
+    ]
+
+    operations = [
+    ]