Commit fce7c945464d888421286d43c221289a99febdaf

Authored by Jailson Dias
1 parent 4b1b6e9b

resolve conflicts

core/decorators.py
... ... @@ -26,4 +26,4 @@ def log_decorator(log_action = '', log_resource = ''):
26 26  
27 27 return wraps(view_function)(_decorator)
28 28  
29   - return _log_decorator
30 29 \ No newline at end of file
  30 + return _log_decorator
... ...
core/mixins.py
... ... @@ -17,4 +17,4 @@ class LogMixin(object):
17 17  
18 18 log.save()
19 19  
20   - return super(LogMixin, self).dispatch(request, *args, **kwargs)
21 20 \ No newline at end of file
  21 + return super(LogMixin, self).dispatch(request, *args, **kwargs)
... ...
users/views.py
... ... @@ -149,4 +149,3 @@ class UpdateUser(LoginRequiredMixin, generic.edit.UpdateView):
149 149 messages.success(self.request, _('Profile edited successfully!'))
150 150  
151 151 return super(UpdateUser, self).form_valid(form)
152   -
... ...