From 7e93aafc3f8d8d7eb77fb6a3a1363567a1246b25 Mon Sep 17 00:00:00 2001
From: "a.feteleu" <a.feteleu@spider.ru>
Date: Wed, 23 Oct 2019 17:05:37 +0300
Subject: [PATCH] added merge migrations

---
 .../migrations/0015_merge_20191023_1317.py        | 14 ++++++++++++++
 apps/news/migrations/0025_merge_20191023_1317.py  | 15 +++++++++++++++
 2 files changed, 29 insertions(+)
 create mode 100644 apps/account/migrations/0015_merge_20191023_1317.py
 create mode 100644 apps/news/migrations/0025_merge_20191023_1317.py

diff --git a/apps/account/migrations/0015_merge_20191023_1317.py b/apps/account/migrations/0015_merge_20191023_1317.py
new file mode 100644
index 00000000..f014afb2
--- /dev/null
+++ b/apps/account/migrations/0015_merge_20191023_1317.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-23 13:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('account', '0014_merge_20191023_0959'),
+        ('account', '0012_merge_20191015_0912'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/news/migrations/0025_merge_20191023_1317.py b/apps/news/migrations/0025_merge_20191023_1317.py
new file mode 100644
index 00000000..96cb3980
--- /dev/null
+++ b/apps/news/migrations/0025_merge_20191023_1317.py
@@ -0,0 +1,15 @@
+# Generated by Django 2.2.4 on 2019-10-23 13:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0024_newsgallery_is_main'),
+        ('news', '0023_auto_20191023_0903'),
+        ('news', '0022_merge_20191015_0912'),
+    ]
+
+    operations = [
+    ]