Exclui arquivo conflituoso

9 years ago · 1f5dc1af44
1 changed files with 0 additions and 16 deletions
--- a/materia/migrations/0031_merge.py
+++ b/materia/migrations/0031_merge.py
@ -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 = [
-    ]