From 5a47e9c087dd3d035654e5c5480e5438e45e8502 Mon Sep 17 00:00:00 2001
From: luxcem <a@luxcem.fr>
Date: Tue, 25 Apr 2017 17:08:56 +0200
Subject: [PATCH] fix migrations

---
 apps/rp/migrations/0011_merge_20170425_1508.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 apps/rp/migrations/0011_merge_20170425_1508.py

diff --git a/apps/rp/migrations/0011_merge_20170425_1508.py b/apps/rp/migrations/0011_merge_20170425_1508.py
new file mode 100644
index 0000000..95c3da0
--- /dev/null
+++ b/apps/rp/migrations/0011_merge_20170425_1508.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-04-25 15:08
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('rp', '0010_auto_20170425_1500'),
+        ('rp', '0010_merge_20170424_1056'),
+    ]
+
+    operations = [
+    ]
-- 
GitLab