From fce7c945464d888421286d43c221289a99febdaf Mon Sep 17 00:00:00 2001 From: Jailson Dias Date: Thu, 8 Sep 2016 15:56:41 -0300 Subject: [PATCH] resolve conflicts --- core/decorators.py | 2 +- core/mixins.py | 2 +- users/views.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/decorators.py b/core/decorators.py index 15f4c20..bde19e4 100644 --- a/core/decorators.py +++ b/core/decorators.py @@ -26,4 +26,4 @@ def log_decorator(log_action = '', log_resource = ''): return wraps(view_function)(_decorator) - return _log_decorator \ No newline at end of file + return _log_decorator diff --git a/core/mixins.py b/core/mixins.py index 00681fa..988d8e8 100644 --- a/core/mixins.py +++ b/core/mixins.py @@ -17,4 +17,4 @@ class LogMixin(object): log.save() - return super(LogMixin, self).dispatch(request, *args, **kwargs) \ No newline at end of file + return super(LogMixin, self).dispatch(request, *args, **kwargs) diff --git a/users/views.py b/users/views.py index 2b7978e..200fb33 100644 --- a/users/views.py +++ b/users/views.py @@ -149,4 +149,3 @@ class UpdateUser(LoginRequiredMixin, generic.edit.UpdateView): messages.success(self.request, _('Profile edited successfully!')) return super(UpdateUser, self).form_valid(form) - -- libgit2 0.21.2