Add migration merge

d120 · Mar 21, 2017 · 87b5378 · 87b5378
1 parent 7429096
commit 87b5378
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/feedback/migrations/0037_merge_20170321_1400.py b/src/feedback/migrations/0037_merge_20170321_1400.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-03-21 14:00
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('feedback', '0036_auto_20170319_1423'),
+        ('feedback', '0032_merge_20170114_1715'),
+    ]
+
+    operations = [
+    ]