From 66a904568b0bb144b0c117d2ff34197be482bef2 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 28 Feb 2024 17:19:10 +0100
Subject: [PATCH 1/2] fixed merge error

---
 recipes/settings.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/settings.py b/recipes/settings.py
index 2f8ecd907..faf841b55 100644
--- a/recipes/settings.py
+++ b/recipes/settings.py
@@ -104,7 +104,7 @@ MESSAGE_TAGS = {messages.ERROR: 'danger'}
 # Application definition
 
 INSTALLED_APPS = [
-    'dal', 'dal_select2', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages',
+    'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages',
     'django.contrib.sites', 'django.contrib.staticfiles', 'django.contrib.postgres', 'oauth2_provider', 'django_prometheus', 'django_tables2', 'corsheaders', 'crispy_forms',
     'crispy_bootstrap4', 'rest_framework', 'rest_framework.authtoken', 'django_cleanup.apps.CleanupConfig', 'webpack_loader', 'django_js_reverse', 'hcaptcha', 'allauth',
     'allauth.account', 'allauth.socialaccount', 'cookbook.apps.CookbookConfig', 'treebeard',

From a02e9e806cc1780ffde1b9bc7bcbc3bb1999fdba Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Wed, 28 Feb 2024 17:21:18 +0100
Subject: [PATCH 2/2] fixed migration tree

---
 .../migrations/0214_delete_shopping_model.py   | 18 ------------------
 .../migrations/0216_delete_shoppinglist.py     | 16 ++++++++++++++++
 2 files changed, 16 insertions(+), 18 deletions(-)
 delete mode 100644 cookbook/migrations/0214_delete_shopping_model.py
 create mode 100644 cookbook/migrations/0216_delete_shoppinglist.py

diff --git a/cookbook/migrations/0214_delete_shopping_model.py b/cookbook/migrations/0214_delete_shopping_model.py
deleted file mode 100644
index 74941a830..000000000
--- a/cookbook/migrations/0214_delete_shopping_model.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Generated by Django 4.2.10 on 2024-02-19 20:21
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        (
-            "cookbook",
-            "0213_remove_property_property_unique_import_food_per_space_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name="ShoppingList",
-        ),
-    ]
diff --git a/cookbook/migrations/0216_delete_shoppinglist.py b/cookbook/migrations/0216_delete_shoppinglist.py
new file mode 100644
index 000000000..b74121ce2
--- /dev/null
+++ b/cookbook/migrations/0216_delete_shoppinglist.py
@@ -0,0 +1,16 @@
+# Generated by Django 4.2.10 on 2024-02-28 16:21
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0215_connectorconfig'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='ShoppingList',
+        ),
+    ]