NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 00:28:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Regenerated migration to resolve conflict with 0049_rackreservation_change_user

Browse Source
This commit is contained in:
Jeremy Stretch 2017-11-10 15:13:36 -05:00
parent a68f528d60
commit d038f369f4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/migrations/0049_interface_vlan_tagging.py → netbox/dcim/migrations/0050_interface_vlan_tagging.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- 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 __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
@ -10,7 +10,7 @@ class Migration(migrations.Migration):
dependencies = [ dependencies = [
('ipam', '0020_ipaddress_add_role_carp'), ('ipam', '0020_ipaddress_add_role_carp'),
('dcim', '0048_rack_serial'), ('dcim', '0049_rackreservation_change_user'),
] ]
operations = [ operations = [