add merge migrations

This commit is contained in:
Dmitriy Kuzmenko 2019-12-23 17:07:49 +03:00
parent 56ed5432e3
commit 6e35713772
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,14 @@
# Generated by Django 2.2.7 on 2019-12-23 14:05
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('news', '0050_auto_20191223_1148'),
('news', '0050_auto_20191223_1238'),
]
operations = [
]

View File

@ -0,0 +1,14 @@
# Generated by Django 2.2.7 on 2019-12-23 14:05
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('product', '0023_merge_20191217_1127'),
('product', '0022_auto_20191220_1007'),
]
operations = [
]