rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-24 20:33:11 +00:00
Code Issues Releases Wiki Activity

[Printer] remove migrations merge conflict

Browse source
This commit is contained in:
Maxime Bombar 2018-10-25 14:23:15 +02:00 committed by root
parent 4b315c3ecf
commit 385e73e02f
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
preferences/migrations/0054_merge_20181025_1258.py Normal file
View file

@ -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 = [
]