From 13edd68d5da5a9e787758418e966046869a3f358 Mon Sep 17 00:00:00 2001
From: Edward Ribeiro <eribeiro@interlegis.leg.br>
Date: Wed, 4 May 2016 17:34:45 -0300
Subject: [PATCH] Faz o merge de migrations de materia

---
 materia/migrations/0031_merge.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/materia/migrations/0031_merge.py b/materia/migrations/0031_merge.py
index 4912ef045..9faf9d45a 100644
--- a/materia/migrations/0031_merge.py
+++ b/materia/migrations/0031_merge.py
@@ -8,8 +8,8 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('materia', '0030_auto_20160502_1630'),
         ('materia', '0030_auto_20160429_1349'),
+        ('materia', '0030_auto_20160502_1630'),
     ]
 
     operations = [