From 140172a17d3e9ac219774fccaa032b60e83406ce Mon Sep 17 00:00:00 2001
From: evgeniy-st <stoyushko.evgeniy@gmail.com>
Date: Thu, 19 Sep 2019 12:55:58 +0300
Subject: [PATCH] merge migrations

---
 .../migrations/0021_merge_20190919_0955.py         | 14 ++++++++++++++
 apps/main/migrations/0016_merge_20190919_0954.py   | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 apps/establishment/migrations/0021_merge_20190919_0955.py
 create mode 100644 apps/main/migrations/0016_merge_20190919_0954.py

diff --git a/apps/establishment/migrations/0021_merge_20190919_0955.py b/apps/establishment/migrations/0021_merge_20190919_0955.py
new file mode 100644
index 00000000..2f2285cb
--- /dev/null
+++ b/apps/establishment/migrations/0021_merge_20190919_0955.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-09-19 09:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('establishment', '0020_merge_20190917_1415'),
+        ('establishment', '0019_position_priority'),
+    ]
+
+    operations = [
+    ]
diff --git a/apps/main/migrations/0016_merge_20190919_0954.py b/apps/main/migrations/0016_merge_20190919_0954.py
new file mode 100644
index 00000000..ad288a32
--- /dev/null
+++ b/apps/main/migrations/0016_merge_20190919_0954.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.4 on 2019-09-19 09:54
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0015_page'),
+        ('main', '0015_merge_20190918_1341'),
+    ]
+
+    operations = [
+    ]