NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-27 10:58:37 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge migrations (were conflicting)

Browse Source
This commit is contained in:
rdujardin 2016-08-03 11:09:20 +02:00
parent 7dafbae4bd
commit 50dc519a42
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
netbox/ipam/migrations/0010_merge.py Normal file
View File

@ -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 = [
]