From 98501296f73afa49a87344e391cad1d7de4130c4 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Thu, 5 May 2016 09:03:26 -0300
Subject: [PATCH] Fix qa e testes

---
 materia/urls.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/materia/urls.py b/materia/urls.py
index 3d197d21b..b04161fb6 100644
--- a/materia/urls.py
+++ b/materia/urls.py
@@ -55,13 +55,6 @@ urlpatterns = [
     url(r'^sistema/materia/status-tramitacao/',
         include(StatusTramitacaoCrud.get_urls())),
     url(r'^sistema/materia/orgao/', include(OrgaoCrud.get_urls())),
-<<<<<<< 87cd7406270bf42bacab49bf32b87b7c838c72d0
-=======
-    url(r'^materia/(?P<pk>\d+)/documento-acessorio$',
-        DocumentoAcessorioView.as_view(), name='documento_acessorio'),
-    url(r'^materia/(?P<pk>\d+)/documento-acessorio/(?P<id>\d+)/edit',
-        DocumentoAcessorioEditView.as_view(), name='documento_acessorio_edit'),
->>>>>>> Init crud relatoria
     url(r'^materia/proposicao$',
         ProposicaoView.as_view(), name='adicionar_proposicao'),
     url(r'^materia/proposicao_list$',