From 0e6f986c86e18e1d84782cb517c152280b7d380f Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 2 Sep 2016 18:09:34 +0300 Subject: [PATCH] Merge Django migrations --- projects/migrations/0025_merge.py | 16 ++++++++++++++++ wallets/migrations/0013_merge.py | 16 ++++++++++++++++ work_sell/migrations/0011_merge.py | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 projects/migrations/0025_merge.py create mode 100644 wallets/migrations/0013_merge.py create mode 100644 work_sell/migrations/0011_merge.py diff --git a/projects/migrations/0025_merge.py b/projects/migrations/0025_merge.py new file mode 100644 index 0000000..2de8cd4 --- /dev/null +++ b/projects/migrations/0025_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-02 15:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0024_auto_20160901_1548'), + ('projects', '0024_auto_20160901_1247'), + ] + + operations = [ + ] diff --git a/wallets/migrations/0013_merge.py b/wallets/migrations/0013_merge.py new file mode 100644 index 0000000..7b32b86 --- /dev/null +++ b/wallets/migrations/0013_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-02 15:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('wallets', '0012_auto_20160901_1548'), + ('wallets', '0012_auto_20160901_1247'), + ] + + operations = [ + ] diff --git a/work_sell/migrations/0011_merge.py b/work_sell/migrations/0011_merge.py new file mode 100644 index 0000000..c0f9c93 --- /dev/null +++ b/work_sell/migrations/0011_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-02 15:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('work_sell', '0009_auto_20160901_1247'), + ('work_sell', '0010_worksell_team'), + ] + + operations = [ + ]