From 7b7d955d0b6ccf781c86475f6284e232209b9a61 Mon Sep 17 00:00:00 2001
From: ArturBaybulatov <neuracorrcommon@gmail.com>
Date: Wed, 7 Sep 2016 17:05:49 +0300
Subject: [PATCH] Merge migrations

---
 common/migrations/0015_merge.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 common/migrations/0015_merge.py

diff --git a/common/migrations/0015_merge.py b/common/migrations/0015_merge.py
new file mode 100644
index 0000000..7cb3d4b
--- /dev/null
+++ b/common/migrations/0015_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-09-07 14:05
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('common', '0014_auto_20160906_1713'),
+        ('common', '0014_auto_20160907_1101'),
+    ]
+
+    operations = [
+    ]