Commit 6069cc59 authored by Luuk Scholten's avatar Luuk Scholten
Browse files

Merge branch 'hotline-fix' into 'master'

Solve migration merge conflict 🚑

that can only mean 1 thing

See merge request !257
parents 2de9b28d b899c8be
# -*- coding: utf-8 -*-
# Generated by Django 1.10.4 on 2016-12-14 19:18
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('newsletters', '0004_newsletterevent_show_costs_warning'),
('newsletters', '0004_auto_20161211_2145'),
]
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