From 248ab072d0c5c86282e9056d472ee3d6ec6576a5 Mon Sep 17 00:00:00 2001
From: Anders Bruun Severinsen <202204885@post.au.dk>
Date: Thu, 17 Oct 2024 20:38:29 +0200
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into Bootstrap5

---
 ...03_auto_20240915_2045_0003_auto_20241017_2029.py | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 bartenders/migrations/0004_merge_0003_auto_20240915_2045_0003_auto_20241017_2029.py

diff --git a/bartenders/migrations/0004_merge_0003_auto_20240915_2045_0003_auto_20241017_2029.py b/bartenders/migrations/0004_merge_0003_auto_20240915_2045_0003_auto_20241017_2029.py
new file mode 100644
index 0000000..66ecf8a
--- /dev/null
+++ b/bartenders/migrations/0004_merge_0003_auto_20240915_2045_0003_auto_20241017_2029.py
@@ -0,0 +1,13 @@
+# Generated by Django 3.2.4 on 2024-10-17 18:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bartenders", "0003_auto_20240915_2045"),
+        ("bartenders", "0003_auto_20241017_2029"),
+    ]
+
+    operations = []