From 4188bad7e25a67a8d980260f2faff4abaca92f44 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 27 Oct 2015 16:15:54 -0200 Subject: [PATCH] Fix merge errors --- protocoloadm/views.py | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/protocoloadm/views.py b/protocoloadm/views.py index dd4e894f6..4b11468d8 100644 --- a/protocoloadm/views.py +++ b/protocoloadm/views.py @@ -751,15 +751,10 @@ class ModelFormDocumentoAcessorioAdministrativo(ModelForm): Submit('submit', 'Salvar', css_class='button primary') ) - ), + ) ) -<< << << < HEAD - super(ModelFormDocumentoAcessorioAdministrativo, - self).__init__(*args, **kwargs) -== == == = - super(ModelFormDocumentoAcessorioAdministrativo, self).__init__( - *args, **kwargs) ->>>>>> > Add Anexada and DespachoInicial in MateriaLegislativa + super(ModelFormDocumentoAcessorioAdministrativo, self).__init__( + *args, **kwargs) class DocumentoAcessorioAdministrativoView(FormMixin, GenericView): @@ -798,15 +793,7 @@ class DocumentoAcessorioAdministrativoView(FormMixin, GenericView): return self.form_valid(form) else: - print(form['data']) -<< << << < HEAD - import ipdb - ipdb.set_trace() - return self.form_invalid(form) - # return HttpResponseRedirect(self.get_success_url()) -== == == = - return self.form_invalid(form) ->>>>>> > Add Anexada and DespachoInicial in MateriaLegislativa + return self.form_invalid(form) def get_success_url(self): pk = self.kwargs['pk']