From e67bd039977b6633943cd01fbf075d7e690043ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= <timothee.floure@posteo.net>
Date: Mon, 13 Apr 2020 11:18:24 +0200
Subject: [PATCH] Migration fix after rebase

---
 .../migrations/0005_auto_20200321_1058.py          |  2 +-
 .../migrations/0009_merge_20200413_0857.py         | 14 ++++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 uncloud_django_based/uncloud/uncloud_vm/migrations/0009_merge_20200413_0857.py

diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0005_auto_20200321_1058.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0005_auto_20200321_1058.py
index 3799e6a..40eface 100644
--- a/uncloud_django_based/uncloud/uncloud_vm/migrations/0005_auto_20200321_1058.py
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0005_auto_20200321_1058.py
@@ -8,7 +8,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('uncloud_vm', '0004_remove_vmproduct_vmid'),
+            ('uncloud_vm', '0005_auto_20200309_1258'),
     ]
 
     operations = [
diff --git a/uncloud_django_based/uncloud/uncloud_vm/migrations/0009_merge_20200413_0857.py b/uncloud_django_based/uncloud/uncloud_vm/migrations/0009_merge_20200413_0857.py
new file mode 100644
index 0000000..2a9d70c
--- /dev/null
+++ b/uncloud_django_based/uncloud/uncloud_vm/migrations/0009_merge_20200413_0857.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.0.5 on 2020-04-13 08:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('uncloud_vm', '0004_remove_vmproduct_vmid'),
+        ('uncloud_vm', '0008_auto_20200403_1727'),
+    ]
+
+    operations = [
+    ]