From 7d6b586323ad6d0bfb2a23165a39c064546ac1f7 Mon Sep 17 00:00:00 2001
From: "regensa.tjahjanto" <regensa.tjahjanto@advotics.com>
Date: Fri, 15 Nov 2019 12:27:27 +0700
Subject: [PATCH] added new migration file

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

diff --git a/core/migrations/0004_merge_20191115_1041.py b/core/migrations/0004_merge_20191115_1041.py
new file mode 100644
index 00000000..bdb99cb6
--- /dev/null
+++ b/core/migrations/0004_merge_20191115_1041.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.17 on 2019-11-15 03:41
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0003_auto_20191115_0855'),
+        ('core', '0002_auto_20191109_2249'),
+    ]
+
+    operations = [
+    ]
-- 
GitLab