Muda o layout do create de reunião

8 years ago · 15e230c4d0
1 changed files with 0 additions and 3 deletions
--- 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: