Commit 23b50643 authored by hynek's avatar hynek 🤤
Browse files

fix(migrations): resolve conflict in ddcomments and merge dddatasets, ddusers

parent 6a249c5c
# Generated by Django 2.2.12 on 2020-06-01 09:27
# Generated by Django 2.2.12 on 2020-06-04 13:36
from django.db import migrations
import django_bleach.models
class Migration(migrations.Migration):
dependencies = [
('ddcomments', '0023_comment_deleted'),
('dddatasets', '0015_auto_20200524_1509'),
('dddatasets', '0015_auto_20200602_1001'),
('dddatasets', '0015_datasetaccessrequest'),
]
operations = [
migrations.AlterField(
model_name='notification',
name='text',
field=django_bleach.models.BleachField(max_length=400),
),
]
# Generated by Django 2.2.12 on 2020-06-04 13:35
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('ddusers', '0004_auto_20200602_0952'),
('ddusers', '0004_project_description'),
]
operations = [
]
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment