From 1f5dc1af446047403adc691949b50caf941fab7a Mon Sep 17 00:00:00 2001
From: Luciano Henrique Nunes de Almeida <mdiebr@gmail.com>
Date: Tue, 10 May 2016 15:45:08 -0300
Subject: [PATCH] Exclui arquivo conflituoso

---
 materia/migrations/0031_merge.py | 16 ----------------
 1 file changed, 16 deletions(-)
 delete mode 100644 materia/migrations/0031_merge.py

diff --git a/materia/migrations/0031_merge.py b/materia/migrations/0031_merge.py
deleted file mode 100644
index 54efc9ec0..000000000
--- a/materia/migrations/0031_merge.py
+++ /dev/null
@@ -1,16 +0,0 @@
-# -*- coding: utf-8 -*-
-# Generated by Django 1.9.5 on 2016-05-10 17:04
-from __future__ import unicode_literals
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('materia', '0030_auto_20160502_1630'),
-        ('materia', '0030_auto_20160429_1349'),
-    ]
-
-    operations = [
-    ]