From 15e230c4d087462eb9dfdda8403a166248321d61 Mon Sep 17 00:00:00 2001
From: Mariana Mendes <mare.s.mendes@gmail.com>
Date: Thu, 1 Mar 2018 09:32:26 -0300
Subject: [PATCH] =?UTF-8?q?Muda=20o=20layout=20do=20create=20de=20reuni?=
 =?UTF-8?q?=C3=A3o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sapl/materia/forms.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py
index c689e33f7..5c4032635 100644
--- a/sapl/materia/forms.py
+++ b/sapl/materia/forms.py
@@ -1250,10 +1250,7 @@ class ProposicaoForm(forms.ModelForm):
                             inst.texto_original:
                         inst.texto_original.delete()
             inst.save()
-<<<<<<< HEAD
-=======
 
->>>>>>> HOT-FIX: tirar ipdb do materia/form
             if receber_recibo == True or not inst.texto_original:
                 inst.hash_code = ''
             else: