From 92d57c97780d24aa6e4909577ce03637d6f0a764 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Tue, 10 May 2016 09:51:36 -0300
Subject: [PATCH] =?UTF-8?q?Adiciona=20campo=20de=20arquivo=20em=20Document?=
 =?UTF-8?q?o=20Acess=C3=B3rio?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 materia/layouts.yaml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/materia/layouts.yaml b/materia/layouts.yaml
index 740530c86..272cb006e 100644
--- a/materia/layouts.yaml
+++ b/materia/layouts.yaml
@@ -65,10 +65,7 @@ DocumentoAcessorio:
   - tipo nome data
   - autor
   - ementa
-<<<<<<< 17f3a6f60978fa9227d01d199824271efa5fcdf7
   - arquivo
-=======
->>>>>>> Init crud documento acessório
 
 Numeracao:
   Numeração: