From 7b1e9946346d7a2b86704232145e5e9538ab6f1f Mon Sep 17 00:00:00 2001
From: Daniel STAN <ds@tudo.re>
Date: Sun, 5 Nov 2017 21:48:26 +0100
Subject: [PATCH] merge migration (granuban|master)

---
 users/migrations/0060_merge_master_granuban.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 users/migrations/0060_merge_master_granuban.py

diff --git a/users/migrations/0060_merge_master_granuban.py b/users/migrations/0060_merge_master_granuban.py
new file mode 100644
index 00000000..5b9dd563
--- /dev/null
+++ b/users/migrations/0060_merge_master_granuban.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2017-11-05 20:47
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0057_bantype_inhibited_services'),
+        ('users', '0059_auto_20171025_1854'),
+    ]
+
+    operations = [
+    ]