From a28d968b5c3e230197b34cdc5933da1241c1935b Mon Sep 17 00:00:00 2001
From: root <root@netbox-sandbox.onr.local>
Date: Fri, 10 Nov 2017 14:48:50 -0600
Subject: [PATCH] Fixed migrations problem

---
 .../migrations/0050_rackreservation_tenant.py    |  2 +-
 .../dcim/migrations/0051_merge_20171031_2024.py  | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 netbox/dcim/migrations/0051_merge_20171031_2024.py

diff --git a/netbox/dcim/migrations/0050_rackreservation_tenant.py b/netbox/dcim/migrations/0050_rackreservation_tenant.py
index 0cf652226..39da00f1f 100644
--- a/netbox/dcim/migrations/0050_rackreservation_tenant.py
+++ b/netbox/dcim/migrations/0050_rackreservation_tenant.py
@@ -10,7 +10,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('tenancy', '0003_unicode_literals'),
-        ('dcim', '0048_rack_serial'),
+        ('dcim', '0049_rackreservation_change_user'),
     ]
 
     operations = [
diff --git a/netbox/dcim/migrations/0051_merge_20171031_2024.py b/netbox/dcim/migrations/0051_merge_20171031_2024.py
deleted file mode 100644
index 699429cd0..000000000
--- a/netbox/dcim/migrations/0051_merge_20171031_2024.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.11.6 on 2017-10-31 20:24
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('dcim', '0049_rackreservation_change_user'),
-        ('dcim', '0050_rackreservation_tenant'),
-    ]
-
-    operations = [
-    ]