Unverified Commit b4ef9260 authored by Joost Rijneveld's avatar Joost Rijneveld
Browse files

Merge conflicting migrations

parent f5210f86
# -*- coding: utf-8 -*-
# Generated by Django 1.10b1 on 2016-07-27 21:33
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('members', '0002_becomeamemberdocument'),
('members', '0002_member_photo'),
operations = [
Supports Markdown
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