# HG changeset patch
# User neko259 <neko259@gmail.com>
# Date 2016-01-01 13:11:07
# Node ID 78e442c6fc4f5e9a5c4ea238b74ca13c90e049fd
# Parent  f2404e3cd214ef46c4d53cc17c212c9659e192c5

Added migration

diff --git a/boards/migrations/0041_merge.py b/boards/migrations/0041_merge.py
new file mode 100644
--- /dev/null
+++ b/boards/migrations/0041_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('boards', '0040_thread_monochrome'),
+        ('boards', '0036_merge'),
+    ]
+
+    operations = [
+    ]