From c83a990165854af975a0527566af68ff104a7659 Mon Sep 17 00:00:00 2001 From: klmp200 Date: Tue, 22 Aug 2017 16:03:24 +0200 Subject: [PATCH] Wtf migration blocking me --- counter/migrations/0015_merge.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 counter/migrations/0015_merge.py diff --git a/counter/migrations/0015_merge.py b/counter/migrations/0015_merge.py new file mode 100644 index 00000000..23830568 --- /dev/null +++ b/counter/migrations/0015_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 = [ + ('counter', '0014_auto_20170817_1537'), + ('counter', '0014_auto_20170816_1521'), + ] + + operations = [ + ]