From 1e0201b95012475d995bbfb66d81a8efb429e039 Mon Sep 17 00:00:00 2001
From: littlewolf <nickptic@code-artel.com>
Date: Mon, 9 Dec 2019 11:33:14 +0300
Subject: [PATCH] Add merge

---
 .../migrations/0032_merge_20191209_0832.py         | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 apps/location/migrations/0032_merge_20191209_0832.py

diff --git a/apps/location/migrations/0032_merge_20191209_0832.py b/apps/location/migrations/0032_merge_20191209_0832.py
new file mode 100644
index 00000000..d75bed32
--- /dev/null
+++ b/apps/location/migrations/0032_merge_20191209_0832.py
@@ -0,0 +1,14 @@
+# Generated by Django 2.2.7 on 2019-12-09 08:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('location', '0031_establishmentwineoriginaddress_wineoriginaddress'),
+        ('location', '0031_auto_20191121_1236'),
+    ]
+
+    operations = [
+    ]