Browse Source

Add missing merge migration

Scot Hacker 8 years ago
parent
commit
aba7aebf05
1 changed files with 16 additions and 0 deletions
  1. 16 0
      bakerydemo/base/migrations/0014_merge_20170228_1619.py

+ 16 - 0
bakerydemo/base/migrations/0014_merge_20170228_1619.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-02-28 16:19
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('base', '0013_auto_20170227_2216'),
+        ('base', '0013_auto_20170228_0714'),
+    ]
+
+    operations = [
+    ]