HOT-FIX: tirar ipdb do materia/form

8 years ago · 75834aa014
1 changed files with 4 additions and 0 deletions
--- 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: