From d4da6dd7c91d7b852cc60ce0c894051ed7e14a5e Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 12 Aug 2016 16:08:53 +0300 Subject: [PATCH] Merge migrations --- projects/migrations/0004_merge.py | 16 ++++++++++++++++ users/migrations/0009_merge.py | 16 ++++++++++++++++ work_sell/migrations/0004_merge.py | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 projects/migrations/0004_merge.py create mode 100644 users/migrations/0009_merge.py create mode 100644 work_sell/migrations/0004_merge.py diff --git a/projects/migrations/0004_merge.py b/projects/migrations/0004_merge.py new file mode 100644 index 0000000..aa3f4dc --- /dev/null +++ b/projects/migrations/0004_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-12 13:08 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0002_remove_portfolio_team'), + ('projects', '0003_auto_20160812_1512'), + ] + + operations = [ + ] diff --git a/users/migrations/0009_merge.py b/users/migrations/0009_merge.py new file mode 100644 index 0000000..6040cf5 --- /dev/null +++ b/users/migrations/0009_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-12 13:07 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0008_auto_20160812_1151'), + ('users', '0008_auto_20160812_1018'), + ] + + operations = [ + ] diff --git a/work_sell/migrations/0004_merge.py b/work_sell/migrations/0004_merge.py new file mode 100644 index 0000000..2115eb2 --- /dev/null +++ b/work_sell/migrations/0004_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-12 13:08 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('work_sell', '0003_auto_20160812_1151'), + ('work_sell', '0003_auto_20160812_1018'), + ] + + operations = [ + ]