Merge migrations

1c8415ac · Gabriel Detraz · root · c41675ab · 1c8415ac
Commit 1c8415ac authored Mar 19, 2018 by Gabriel Detraz Committed by root Mar 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 0 deletions

0030_merge_20180319_0149.py preferences/migrations/0030_merge_20180319_0149.py +16 -0

No files found.
--- a/preferences/migrations/0030_merge_20180319_0149.py
+++ b/preferences/migrations/0030_merge_20180319_0149.py
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-03-19 00:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0029_auto_20180318_1005'),
+        ('preferences', '0029_auto_20180318_0213'),
+    ]
+
+    operations = [
+    ]