From 68ce62d503d5953d3f07bc840282e87804b825f8 Mon Sep 17 00:00:00 2001
From: rscnt <rascnt@gmail.com>
Date: Sat, 30 May 2015 15:31:07 -0600
Subject: [PATCH] migrations: merge brings the same migration.

Signed-off-by: rscnt <rascnt@gmail.com>
---
 digital_glarus/migrations/0003_merge.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 digital_glarus/migrations/0003_merge.py

diff --git a/digital_glarus/migrations/0003_merge.py b/digital_glarus/migrations/0003_merge.py
new file mode 100644
index 00000000..49e26d1c
--- /dev/null
+++ b/digital_glarus/migrations/0003_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 = [
+        ('digital_glarus', '0002_auto_20150522_0450'),
+        ('digital_glarus', '0002_auto_20150527_1023'),
+    ]
+
+    operations = [
+    ]