From 87cd7406270bf42bacab49bf32b87b7c838c72d0 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Mon, 2 May 2016 11:22:56 -0300
Subject: [PATCH] =?UTF-8?q?Init=20Crud=20Tramita=C3=A7=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 materia/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/materia/views.py b/materia/views.py
index e0e9d2edf..8c2dc3a17 100644
--- a/materia/views.py
+++ b/materia/views.py
@@ -347,7 +347,6 @@ class DocumentoAcessorioView(CreateView):
         return reverse('materia:documento_acessorio', kwargs={'pk': pk})
 
 
->>>>>>> Init crud legislação citada
 class AcompanhamentoConfirmarView(TemplateView):
 
     def get_redirect_url(self):