From 9b16b94947cf105e61adeaad8337a0cfcf70e073 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Thu, 22 Sep 2016 17:08:03 +0300
Subject: [PATCH] Migrations merge

---
 projects/migrations/0046_merge.py  | 16 ++++++++++++++++
 work_sell/migrations/0018_merge.py | 16 ++++++++++++++++
 2 files changed, 32 insertions(+)
 create mode 100644 projects/migrations/0046_merge.py
 create mode 100644 work_sell/migrations/0018_merge.py

diff --git a/projects/migrations/0046_merge.py b/projects/migrations/0046_merge.py
new file mode 100644
index 0000000..2257108
--- /dev/null
+++ b/projects/migrations/0046_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-22 14:07
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0045_auto_20160922_0039'),
+        ('projects', '0043_auto_20160922_1705'),
+    ]
+
+    operations = [
+    ]
diff --git a/work_sell/migrations/0018_merge.py b/work_sell/migrations/0018_merge.py
new file mode 100644
index 0000000..6db661d
--- /dev/null
+++ b/work_sell/migrations/0018_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-22 14:07
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('work_sell', '0017_auto_20160922_0057'),
+        ('work_sell', '0017_auto_20160922_1705'),
+    ]
+
+    operations = [
+    ]