[Toaster] [PATCH v6 32/41] toaster: fix conflicting migrations

[Ed Bartosh]

Fixed by running manage.py makemigrations --merge

Signed-off-by: Ed Bartosh <ed.bartosh at linux.intel.com>
---
 bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py | 15 +++++++++++++++
 bitbake/lib/toaster/orm/migrations/0007_merge.py        | 15 +++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py
 create mode 100644 bitbake/lib/toaster/orm/migrations/0007_merge.py

diff --git a/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py b/bitbake/lib/toaster/bldcontrol/migrations/0003_merge.py
new file mode 100644
index 0000000..b0f6b16
--- /dev/null
+++ b/bitbake/lib/toaster/bldcontrol/migrations/0003_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 = [
+        ('bldcontrol', '0002_add_cancelling_state'),
+        ('bldcontrol', '0002_auto_20160120_1250'),
+    ]
+
+    operations = [
+    ]
diff --git a/bitbake/lib/toaster/orm/migrations/0007_merge.py b/bitbake/lib/toaster/orm/migrations/0007_merge.py
new file mode 100644
index 0000000..5d92f336
--- /dev/null
+++ b/bitbake/lib/toaster/orm/migrations/0007_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 = [
+        ('orm', '0006_add_cancelled_state'),
+        ('orm', '0006_remove_build_build_name'),
+    ]
+
+    operations = [
+    ]
-- 
2.1.4