From 9872301f033e6be145f842bc9e9faaf311896ae1 Mon Sep 17 00:00:00 2001
From: vabene1111 <vabene1234@googlemail.com>
Date: Tue, 19 Nov 2019 19:37:36 +0100
Subject: [PATCH] merged migrations

---
 .idea/inspectionProfiles/Project_Default.xml    | 14 ++++++++++++++
 cookbook/migrations/0014_merge_20191119_1937.py | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 .idea/inspectionProfiles/Project_Default.xml
 create mode 100644 cookbook/migrations/0014_merge_20191119_1937.py

diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
new file mode 100644
index 000000000..5c09ca91d
--- /dev/null
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,14 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="1">
+            <item index="0" class="java.lang.String" itemvalue="psycopg2" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
+  </profile>
+</component>
\ No newline at end of file
diff --git a/cookbook/migrations/0014_merge_20191119_1937.py b/cookbook/migrations/0014_merge_20191119_1937.py
new file mode 100644
index 000000000..a15950c42
--- /dev/null
+++ b/cookbook/migrations/0014_merge_20191119_1937.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.7 on 2019-11-19 18:37
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cookbook', '0013_auto_20191118_1328'),
+        ('cookbook', '0012_auto_20191115_1504'),
+    ]
+
+    operations = [
+    ]