From 50dc519a42c8faeae53e7fa1815cc6ab24488bf7 Mon Sep 17 00:00:00 2001
From: rdujardin <rdujardin@rdujardin.com>
Date: Wed, 3 Aug 2016 11:09:20 +0200
Subject: [PATCH] Merge migrations (were conflicting)

---
 netbox/ipam/migrations/0010_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 netbox/ipam/migrations/0010_merge.py

diff --git a/netbox/ipam/migrations/0010_merge.py b/netbox/ipam/migrations/0010_merge.py
new file mode 100644
index 000000000..421bea127
--- /dev/null
+++ b/netbox/ipam/migrations/0010_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.8 on 2016-08-03 09:06
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('ipam', '0007_prefix_ipaddress_add_tenant'),
+        ('ipam', '0009_auto_20160728_0854'),
+    ]
+
+    operations = [
+    ]