From d038f369f442b4fcbf49fa639cbe312285a49e39 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 10 Nov 2017 15:13:36 -0500 Subject: [PATCH] Regenerated migration to resolve conflict with 0049_rackreservation_change_user --- ...terface_vlan_tagging.py => 0050_interface_vlan_tagging.py} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename netbox/dcim/migrations/{0049_interface_vlan_tagging.py => 0050_interface_vlan_tagging.py} (91%) diff --git a/netbox/dcim/migrations/0049_interface_vlan_tagging.py b/netbox/dcim/migrations/0050_interface_vlan_tagging.py similarity index 91% rename from netbox/dcim/migrations/0049_interface_vlan_tagging.py rename to netbox/dcim/migrations/0050_interface_vlan_tagging.py index a215bf6db..cb44054a7 100644 --- a/netbox/dcim/migrations/0049_interface_vlan_tagging.py +++ b/netbox/dcim/migrations/0050_interface_vlan_tagging.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.4 on 2017-10-13 20:22 +# Generated by Django 1.11.6 on 2017-11-10 20:10 from __future__ import unicode_literals from django.db import migrations, models @@ -10,7 +10,7 @@ class Migration(migrations.Migration): dependencies = [ ('ipam', '0020_ipaddress_add_role_carp'), - ('dcim', '0048_rack_serial'), + ('dcim', '0049_rackreservation_change_user'), ] operations = [