added merge migration

2019-11-12 15:18:46 +03:00 · 2019-11-12 15:18:46 +03:00 · 0af5de9bd4
commit 0af5de9bd4
parent d2af496b17
1 changed files with 14 additions and 0 deletions
--- a/apps/main/migrations/0035_merge_20191112_1218.py
+++ 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 = [
+    ]