From f8d5f072f801d68423097486e3142690b337e850 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Wed, 22 Jan 2020 09:48:06 +0100 Subject: [PATCH] Fixed migration conflict. --- .../{0018_auto_20200121_1659.py => 0019_auto_20200121_1659.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename modoboa/core/migrations/{0018_auto_20200121_1659.py => 0019_auto_20200121_1659.py} (94%) diff --git a/modoboa/core/migrations/0018_auto_20200121_1659.py b/modoboa/core/migrations/0019_auto_20200121_1659.py similarity index 94% rename from modoboa/core/migrations/0018_auto_20200121_1659.py rename to modoboa/core/migrations/0019_auto_20200121_1659.py index bd7c3ba35..131a4b231 100644 --- a/modoboa/core/migrations/0018_auto_20200121_1659.py +++ b/modoboa/core/migrations/0019_auto_20200121_1659.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('core', '0017_auto_20190705_1045'), + ('core', '0018_auto_20200104_1714'), ] operations = [