From 2ab2c37f5a0788cbf587602d56b90092783fe55c Mon Sep 17 00:00:00 2001 From: Daniel Quinn Date: Sun, 27 May 2018 14:28:33 +0100 Subject: [PATCH] Fix migration conflict --- ...9_document_storage_type.py => 0020_document_storage_type.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename src/documents/migrations/{0019_document_storage_type.py => 0020_document_storage_type.py} (91%) diff --git a/src/documents/migrations/0019_document_storage_type.py b/src/documents/migrations/0020_document_storage_type.py similarity index 91% rename from src/documents/migrations/0019_document_storage_type.py rename to src/documents/migrations/0020_document_storage_type.py index bd3595643..83a3a2b5d 100644 --- a/src/documents/migrations/0019_document_storage_type.py +++ b/src/documents/migrations/0020_document_storage_type.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('documents', '0018_auto_20170715_1712'), + ('documents', '0019_add_consumer_user'), ] operations = [