1 files changed, 15 insertions, 0 deletions
diff --git a/servo/migrations/0006_merge.py b/servo/migrations/0006_merge.py
new file mode 100644
index 0000000..99f1291
--- /dev/null
+++ b/servo/migrations/0006_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('servo', '0004_auto_20141230_1630'),
+        ('servo', '0005_auto_20141229_2045'),
+    ]
+
+    operations = [
+    ]