From 6892a55db00bcbe886a340c1d5795837db622e18 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 3 Apr 2019 10:28:49 +0000 Subject: [PATCH] Fixed a migrations conflict - Legacy-Id: 16128 --- ...uto_20190323_0611.py => 0013_make_separate_break_sessobj.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename ietf/meeting/migrations/{0012_auto_20190323_0611.py => 0013_make_separate_break_sessobj.py} (96%) diff --git a/ietf/meeting/migrations/0012_auto_20190323_0611.py b/ietf/meeting/migrations/0013_make_separate_break_sessobj.py similarity index 96% rename from ietf/meeting/migrations/0012_auto_20190323_0611.py rename to ietf/meeting/migrations/0013_make_separate_break_sessobj.py index d4c3e0fa1..3d2e77c64 100644 --- a/ietf/meeting/migrations/0012_auto_20190323_0611.py +++ b/ietf/meeting/migrations/0013_make_separate_break_sessobj.py @@ -34,7 +34,7 @@ def backward(apps, schema_editor): class Migration(migrations.Migration): dependencies = [ - ('meeting', '0011_auto_20190114_0550'), + ('meeting', '0012_add_slide_submissions'), ] operations = [