resolve migrations conflict
This commit is contained in:
parent
7fa7a218e7
commit
9c8086e6d9
|
@ -0,0 +1,16 @@
|
|||
# -*- coding: utf-8 -*-
|
||||
# Generated by Django 1.11.9 on 2018-02-01 13:55
|
||||
from __future__ import unicode_literals
|
||||
|
||||
from django.db import migrations
|
||||
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('zoo_data', '0008_auto_20180115_1141'),
|
||||
('zoo_data', '0008_auto_20180125_0939'),
|
||||
]
|
||||
|
||||
operations = [
|
||||
]
|
Loading…
Reference in New Issue