From 81852de1fa968e5f8609a9f9f081355502722169 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 15 Nov 2017 13:57:19 -0500 Subject: [PATCH] Resolved migration collision from #1672 --- ...ckreservation_tenant.py => 0051_rackreservation_tenant.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename netbox/dcim/migrations/{0050_rackreservation_tenant.py => 0051_rackreservation_tenant.py} (84%) diff --git a/netbox/dcim/migrations/0050_rackreservation_tenant.py b/netbox/dcim/migrations/0051_rackreservation_tenant.py similarity index 84% rename from netbox/dcim/migrations/0050_rackreservation_tenant.py rename to netbox/dcim/migrations/0051_rackreservation_tenant.py index 39da00f1f..90a551eb8 100644 --- a/netbox/dcim/migrations/0050_rackreservation_tenant.py +++ b/netbox/dcim/migrations/0051_rackreservation_tenant.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.6 on 2017-10-30 20:43 +# Generated by Django 1.11.6 on 2017-11-15 18:56 from __future__ import unicode_literals from django.db import migrations, models @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ ('tenancy', '0003_unicode_literals'), - ('dcim', '0049_rackreservation_change_user'), + ('dcim', '0050_interface_vlan_tagging'), ] operations = [