merging of migration

d75e4586 · John Red Medrano · 2e875deb · d75e4586
Commit d75e4586 authored Nov 08, 2019 by John Red Medrano
Show whitespace changes
Inline Side-by-side

Showing with 14 additions and 0 deletions

app/entities/migrations/0033_merge_20191108_1725.py app/entities/migrations/0033_merge_20191108_1725.py +14 -0

No files found.
--- a/app/entities/migrations/0033_merge_20191108_1725.py
+++ b/app/entities/migrations/0033_merge_20191108_1725.py
+# Generated by Django 2.2 on 2019-11-08 17:25
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('entities', '0032_auto_20191108_1109'),
+        ('entities', '0029_userhistory'),
+    ]
+
+    operations = [
+    ]