From 75834aa0141a05949e9717e65adaa570a4eae0ec Mon Sep 17 00:00:00 2001
From: "tapumar@gmail.com" <tapumar@gmail.com>
Date: Thu, 1 Mar 2018 10:24:31 -0300
Subject: [PATCH] HOT-FIX: tirar ipdb do materia/form

---
 sapl/materia/forms.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sapl/materia/forms.py b/sapl/materia/forms.py
index a9fe99a71..c689e33f7 100644
--- a/sapl/materia/forms.py
+++ b/sapl/materia/forms.py
@@ -1250,6 +1250,10 @@ 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: