From 385e73e02ffac0d9e37ca56207a4e9e1846831f5 Mon Sep 17 00:00:00 2001
From: Maxime Bombar <bombar@crans.org>
Date: Thu, 25 Oct 2018 14:23:15 +0200
Subject: [PATCH] [Printer] remove migrations merge conflict

---
 .../migrations/0054_merge_20181025_1258.py       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 preferences/migrations/0054_merge_20181025_1258.py

diff --git a/preferences/migrations/0054_merge_20181025_1258.py b/preferences/migrations/0054_merge_20181025_1258.py
new file mode 100644
index 00000000..93e32336
--- /dev/null
+++ b/preferences/migrations/0054_merge_20181025_1258.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.7 on 2018-10-25 10:58
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('preferences', '0053_optionalprinter_printer_enabled'),
+        ('preferences', '0053_optionaluser_self_change_room'),
+    ]
+
+    operations = [
+    ]