NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-25 18:08:38 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Resolved migration collision from #1672

Browse Source
This commit is contained in:
Jeremy Stretch 2017-11-15 13:57:19 -05:00
parent fbd39da8ca
commit 81852de1fa
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/0050_rackreservation_tenant.py → netbox/dcim/migrations/0051_rackreservation_tenant.py
View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- 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 __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 = [
('tenancy', '0003_unicode_literals'), ('tenancy', '0003_unicode_literals'),
('dcim', '0049_rackreservation_change_user'), ('dcim', '0050_interface_vlan_tagging'),
] ]
operations = [ operations = [