Fixing merge tool induced file endings

This commit is contained in:
Jon Gregorowicz 2016-02-16 00:49:41 -05:00
parent 8b5e5173d0
commit 511329c30a
3 changed files with 3 additions and 3 deletions

View File

@ -102,4 +102,4 @@ class SocialLoginView(LoginView):
------------- -------------
""" """
serializer_class = SocialLoginSerializer serializer_class = SocialLoginSerializer

View File

@ -25,4 +25,4 @@ def jwt_encode(user):
jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER
payload = jwt_payload_handler(user) payload = jwt_payload_handler(user)
return jwt_encode_handler(payload) return jwt_encode_handler(payload)

View File

@ -175,4 +175,4 @@ class PasswordChangeView(GenericAPIView):
serializer = self.get_serializer(data=request.data) serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
serializer.save() serializer.save()
return Response({"success": "New password has been saved."}) return Response({"success": "New password has been saved."})