From bfcebb26f106d8e0d31c10ae22436f8202ec5a21 Mon Sep 17 00:00:00 2001
From: LeandroRoberto <leandroroberto.br@gmail.com>
Date: Mon, 25 Apr 2016 14:23:37 -0300
Subject: [PATCH] =?UTF-8?q?Corre=C3=A7=C3=A3o=20de=20falha=20ao=20fazer=20?=
 =?UTF-8?q?rebase?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crud/masterdetail.py   | 3 ---
 parlamentares/forms.py | 3 ++-
 protocoloadm/views.py  | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crud/masterdetail.py b/crud/masterdetail.py
index aa0c55e6f..ad82261c7 100644
--- a/crud/masterdetail.py
+++ b/crud/masterdetail.py
@@ -70,13 +70,10 @@ class MasterDetailCrud(Crud):
         def get_url_regex(cls):
             return r'^%s/(?P<pk>\d+)/delete$' % cls.model._meta.model_name
 
-<<<<<<< c9325f593ff07366e8a4acc20bdfba1f54ce254e
         def get_success_url(self):
             pk = getattr(self.get_object(), self.crud.parent_field).pk
             return self.resolve_url(LIST, args=(pk,))
 
-=======
->>>>>>> Adiciona listagem ao crud mestre detalhe
     @classonlymethod
     def build(cls, model, parent_field, help_path):
         crud = super(MasterDetailCrud, cls).build(model, help_path)
diff --git a/parlamentares/forms.py b/parlamentares/forms.py
index 931caff90..f48f70e0e 100644
--- a/parlamentares/forms.py
+++ b/parlamentares/forms.py
@@ -4,6 +4,7 @@ from django import forms
 from django.db import transaction
 from django.forms import ModelForm
 from django.utils.translation import ugettext_lazy as _
+from floppyforms.widgets import ClearableFileInput
 
 import crispy_layout_mixin
 import sapl
@@ -23,7 +24,7 @@ class ParlamentarForm(ModelForm):
         exclude = []
         widgets = {'fotografia': sapl.utils.ImageThumbnailFileInput,
                    'biografia': forms.Textarea(
-                        attrs={'id': 'texto-rico'})}
+                       attrs={'id': 'texto-rico'})}
 
 
 class ParlamentarCreateForm(ParlamentarForm):
diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index 8757debd4..14cec4ea3 100644
--- a/protocoloadm/views.py
+++ b/protocoloadm/views.py
@@ -3,7 +3,7 @@ from datetime import date, datetime
 
 from braces.views import FormValidMessageMixin
 from django.core.urlresolvers import reverse, reverse_lazy
-from django.db.models import Q, Max
+from django.db.models import Max, Q
 from django.http import HttpResponse, HttpResponseRedirect
 from django.shortcuts import redirect
 from django.utils.translation import ugettext_lazy as _