From 393aa9ef28443b64ee0bf8993f6da8581b9a65f4 Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Tue, 1 Oct 2019 18:30:49 +0300 Subject: [PATCH] Merge migrations after rebase --- .../migrations/0032_merge_20191001_1530.py | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 apps/establishment/migrations/0032_merge_20191001_1530.py diff --git a/apps/establishment/migrations/0032_merge_20191001_1530.py b/apps/establishment/migrations/0032_merge_20191001_1530.py new file mode 100644 index 00000000..d0448141 --- /dev/null +++ b/apps/establishment/migrations/0032_merge_20191001_1530.py @@ -0,0 +1,14 @@ +# Generated by Django 2.2.4 on 2019-10-01 15:30 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('establishment', '0020_auto_20190916_1532'), + ('establishment', '0031_establishment_slug'), + ] + + operations = [ + ]