From 0f595ee40bc5a2e3807107ab0b813b1657863c2a Mon Sep 17 00:00:00 2001
From: alex <birukov.system@gmail.com>
Date: Fri, 25 Oct 2019 12:07:02 +0300
Subject: [PATCH] merge migrations

---
 .../gallery/migrations/0004_merge_20191025_0906.py | 14 ++++++++++++++
 apps/news/migrations/0029_merge_20191025_0906.py   | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 apps/gallery/migrations/0004_merge_20191025_0906.py
 create mode 100644 apps/news/migrations/0029_merge_20191025_0906.py

diff --git a/apps/gallery/migrations/0004_merge_20191025_0906.py b/apps/gallery/migrations/0004_merge_20191025_0906.py
new file mode 100644
index 00000000..4372fa95
--- /dev/null
+++ b/apps/gallery/migrations/0004_merge_20191025_0906.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-25 09:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('gallery', '0002_auto_20191023_1207'),
+        ('gallery', '0003_auto_20191003_1228'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/news/migrations/0029_merge_20191025_0906.py b/apps/news/migrations/0029_merge_20191025_0906.py
new file mode 100644
index 00000000..e5967a8d
--- /dev/null
+++ b/apps/news/migrations/0029_merge_20191025_0906.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-25 09:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0028_auto_20191024_1649'),
+        ('news', '0021_auto_20191021_1120'),
+    ]
+
+    operations = [
+    ]