Commit 537d0822 authored by Jean-Baptiste Pasquier's avatar Jean-Baptiste Pasquier

fix: migration conflict

parent 6ddb65ef
# -*- coding: utf-8 -*-
# Generated by Django 1.11.20 on 2019-10-15 15:52
from __future__ import unicode_literals
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('djangoldp_project', '0004_auto_20191003_1145'),
]
operations = [
migrations.AlterField(
model_name='project',
name='team',
field=models.ManyToManyField(blank=True, through='djangoldp_project.Member', to=settings.AUTH_USER_MODEL),
),
]
# -*- coding: utf-8 -*-
# Generated by Django 1.11.25 on 2019-10-16 10:30
# Generated by Django 1.11.20 on 2019-10-17 14:32
from __future__ import unicode_literals
from django.conf import settings
......
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