From d31bb9b495629ecb780ffdc7079e3839d494469d Mon Sep 17 00:00:00 2001
From: "a.feteleu" <a.feteleu@spider.ru>
Date: Wed, 30 Oct 2019 19:19:40 +0300
Subject: [PATCH] merge migrations

---
 .../migrations/0046_merge_20191030_1618.py         | 14 ++++++++++++++
 .../migrations/0019_merge_20191030_1618.py         | 14 ++++++++++++++
 apps/news/migrations/0033_merge_20191030_1618.py   | 14 ++++++++++++++
 3 files changed, 42 insertions(+)
 create mode 100644 apps/establishment/migrations/0046_merge_20191030_1618.py
 create mode 100644 apps/location/migrations/0019_merge_20191030_1618.py
 create mode 100644 apps/news/migrations/0033_merge_20191030_1618.py

diff --git a/apps/establishment/migrations/0046_merge_20191030_1618.py b/apps/establishment/migrations/0046_merge_20191030_1618.py
new file mode 100644
index 00000000..853b25eb
--- /dev/null
+++ b/apps/establishment/migrations/0046_merge_20191030_1618.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-30 16:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('establishment', '0045_auto_20191029_0719'),
+        ('establishment', '0044_position_index_name'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/location/migrations/0019_merge_20191030_1618.py b/apps/location/migrations/0019_merge_20191030_1618.py
new file mode 100644
index 00000000..74d64c63
--- /dev/null
+++ b/apps/location/migrations/0019_merge_20191030_1618.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-30 16:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0018_address_old_id'),
+        ('location', '0013_wineappellation_wineregion'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/news/migrations/0033_merge_20191030_1618.py b/apps/news/migrations/0033_merge_20191030_1618.py
new file mode 100644
index 00000000..05811754
--- /dev/null
+++ b/apps/news/migrations/0033_merge_20191030_1618.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-10-30 16:18
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('news', '0032_auto_20191030_1149'),
+        ('news', '0029_auto_20191025_1241'),
+    ]
+
+    operations = [
+    ]