From a3a572a8a89df29152d299c6a051d2035aa94255 Mon Sep 17 00:00:00 2001 From: "Ing. Jan KRCMAR" Date: Mon, 12 Sep 2016 11:02:01 +0200 Subject: [PATCH] Fixed: Conflicting migrations detected (0004_userinstance_is_vnc, 0007_auto_20160426_0635 in accounts) --- accounts/migrations/0008_merge.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 accounts/migrations/0008_merge.py diff --git a/accounts/migrations/0008_merge.py b/accounts/migrations/0008_merge.py new file mode 100644 index 0000000..8edf672 --- /dev/null +++ b/accounts/migrations/0008_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 = [ + ('accounts', '0004_userinstance_is_vnc'), + ('accounts', '0007_auto_20160426_0635'), + ] + + operations = [ + ]