Resolved migration collision from #1672

netbox/dcim/migrations/0050_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 = [