From 2e05eeca54c94f5d8505f36ce55353a8aea39183 Mon Sep 17 00:00:00 2001 From: Troy Sankey Date: Thu, 29 Mar 2018 14:35:55 -0400 Subject: [PATCH] reorder 0017_auto_20180327_1631 to be after the other 0017 The migration 0017_remove_icon_class_image_secondary_fields was in conflict with 0017_auto_20180327_1631, so we bump the latter to 0018. --- .../{0017_auto_20180327_1631.py => 0018_auto_20180327_1631.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename common/djangoapps/third_party_auth/migrations/{0017_auto_20180327_1631.py => 0018_auto_20180327_1631.py} (92%) diff --git a/common/djangoapps/third_party_auth/migrations/0017_auto_20180327_1631.py b/common/djangoapps/third_party_auth/migrations/0018_auto_20180327_1631.py similarity index 92% rename from common/djangoapps/third_party_auth/migrations/0017_auto_20180327_1631.py rename to common/djangoapps/third_party_auth/migrations/0018_auto_20180327_1631.py index 0bc41efc83..c5f00b8d4d 100644 --- a/common/djangoapps/third_party_auth/migrations/0017_auto_20180327_1631.py +++ b/common/djangoapps/third_party_auth/migrations/0018_auto_20180327_1631.py @@ -7,7 +7,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('third_party_auth', '0016_auto_20180130_0938'), + ('third_party_auth', '0017_remove_icon_class_image_secondary_fields'), ] operations = [