From 12a97204b100b3695c6c6d5c83cce10ed6484627 Mon Sep 17 00:00:00 2001 From: Oliver Date: Wed, 18 Apr 2018 01:18:15 +1000 Subject: [PATCH] Merged migration files --- .../migrations/0005_merge_20180417_1517.py | 16 ++++++++++++++++ .../migrations/0013_merge_20180417_1517.py | 16 ++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 InvenTree/customer/migrations/0005_merge_20180417_1517.py create mode 100644 InvenTree/supplier/migrations/0013_merge_20180417_1517.py diff --git a/InvenTree/customer/migrations/0005_merge_20180417_1517.py b/InvenTree/customer/migrations/0005_merge_20180417_1517.py new file mode 100644 index 0000000000..6d762128e4 --- /dev/null +++ b/InvenTree/customer/migrations/0005_merge_20180417_1517.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.12 on 2018-04-17 15:17 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('customer', '0002_auto_20180417_1436'), + ('customer', '0004_auto_20180417_1516'), + ] + + operations = [ + ] diff --git a/InvenTree/supplier/migrations/0013_merge_20180417_1517.py b/InvenTree/supplier/migrations/0013_merge_20180417_1517.py new file mode 100644 index 0000000000..021c3fcf0f --- /dev/null +++ b/InvenTree/supplier/migrations/0013_merge_20180417_1517.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.12 on 2018-04-17 15:17 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('supplier', '0009_auto_20180417_1516'), + ('supplier', '0012_auto_20180417_1447'), + ] + + operations = [ + ]