From 136f3bab1b6366d4017e5dad6db1471a462ae8c1 Mon Sep 17 00:00:00 2001
From: Joshua Casey <joshua.caseyd@gmail.com>
Date: Wed, 26 Apr 2017 05:15:50 +0700
Subject: [PATCH] [#140655219] merge migrations

---
 core/migrations/0011_merge_20170425_2214.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 core/migrations/0011_merge_20170425_2214.py

diff --git a/core/migrations/0011_merge_20170425_2214.py b/core/migrations/0011_merge_20170425_2214.py
new file mode 100644
index 00000000..c255ca51
--- /dev/null
+++ b/core/migrations/0011_merge_20170425_2214.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.5 on 2017-04-25 22:14
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0010_student_photo'),
+        ('core', '0007_auto_20170425_1550'),
+    ]
+
+    operations = [
+    ]
-- 
GitLab