Resolve merge conflicts

andela · Aug 16, 2018 · 5e25486 · 5e25486
1 parent be86440
commit 5e25486
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/wger/core/migrations/0012_merge.py b/wger/core/migrations/0012_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-08-16 17:45
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0011_auto_20180816_2013'),
+        ('core', '0010_auto_20180815_0053'),
+    ]
+
+    operations = [
+    ]