From 1794a2cef2ee38d232efd94e9eaab04b26c4d81a Mon Sep 17 00:00:00 2001 From: Hartmut Holzgraefe Date: Mon, 2 Jan 2017 19:35:55 +0000 Subject: [PATCH] django migration fix after merge --- ...{0003_maprenderingjob_dpi.py => 0004_maprenderingjob_dpi.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename www/maposmatic/migrations/{0003_maprenderingjob_dpi.py => 0004_maprenderingjob_dpi.py} (87%) diff --git a/www/maposmatic/migrations/0003_maprenderingjob_dpi.py b/www/maposmatic/migrations/0004_maprenderingjob_dpi.py similarity index 87% rename from www/maposmatic/migrations/0003_maprenderingjob_dpi.py rename to www/maposmatic/migrations/0004_maprenderingjob_dpi.py index e936902f..fa8c443b 100644 --- a/www/maposmatic/migrations/0003_maprenderingjob_dpi.py +++ b/www/maposmatic/migrations/0004_maprenderingjob_dpi.py @@ -7,7 +7,7 @@ from django.db import models, migrations class Migration(migrations.Migration): dependencies = [ - ('maposmatic', '0002_maprenderingjob_overlay'), + ('maposmatic', '0003_auto_20161112_1521'), ] operations = [