From 0af5de9bd40f92268992a86779e52adb242ad893 Mon Sep 17 00:00:00 2001
From: "a.feteleu" <a.feteleu@spider.ru>
Date: Tue, 12 Nov 2019 15:18:46 +0300
Subject: [PATCH] added merge migration

---
 apps/main/migrations/0035_merge_20191112_1218.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 apps/main/migrations/0035_merge_20191112_1218.py

diff --git a/apps/main/migrations/0035_merge_20191112_1218.py b/apps/main/migrations/0035_merge_20191112_1218.py
new file mode 100644
index 00000000..2f25a46f
--- /dev/null
+++ b/apps/main/migrations/0035_merge_20191112_1218.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.7 on 2019-11-12 12:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0034_sitefeature_nested'),
+        ('main', '0034_auto_20191112_0104'),
+    ]
+
+    operations = [
+    ]