From 5058790995933b155d87605b7c66b31b403f5b5c Mon Sep 17 00:00:00 2001 From: Bruno Tikami Date: Wed, 24 Feb 2016 10:42:14 -0300 Subject: [PATCH] BUGFIX: Fixing migration merge conflict. --- ...ticket.py => 0013_add_submitter_email_id_field_to_ticket.py} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename helpdesk/migrations/{0012_add_submitter_email_id_field_to_ticket.py => 0013_add_submitter_email_id_field_to_ticket.py} (90%) diff --git a/helpdesk/migrations/0012_add_submitter_email_id_field_to_ticket.py b/helpdesk/migrations/0013_add_submitter_email_id_field_to_ticket.py similarity index 90% rename from helpdesk/migrations/0012_add_submitter_email_id_field_to_ticket.py rename to helpdesk/migrations/0013_add_submitter_email_id_field_to_ticket.py index 1a932260..e312c544 100644 --- a/helpdesk/migrations/0012_add_submitter_email_id_field_to_ticket.py +++ b/helpdesk/migrations/0013_add_submitter_email_id_field_to_ticket.py @@ -8,7 +8,7 @@ from django.db import migrations, models class Migration(migrations.Migration): dependencies = [ - ('helpdesk', '0011_admin_related_improvements'), + ('helpdesk', '0012_queue_default_owner'), ] operations = [