From e283f2513da4ca81c144c92694da0093ff8059f8 Mon Sep 17 00:00:00 2001
From: Raphael Michel <mail@raphaelmichel.de>
Date: Wed, 4 Mar 2015 11:52:57 +0100
Subject: [PATCH] Merge migrations

---
 src/pretix/base/migrations/0013_merge.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 src/pretix/base/migrations/0013_merge.py

diff --git a/src/pretix/base/migrations/0013_merge.py b/src/pretix/base/migrations/0013_merge.py
new file mode 100644
index 000000000..40f921eb9
--- /dev/null
+++ b/src/pretix/base/migrations/0013_merge.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pretixbase', '0011_remove_event_max_items_per_order'),
+        ('pretixbase', '0012_auto_20150304_1038'),
+    ]
+
+    operations = [
+    ]