mirror of
				https://github.com/Tivix/django-rest-auth.git
				synced 2025-10-31 15:57:34 +03:00 
			
		
		
		
	Fixing merge tool induced file endings
This commit is contained in:
		
							parent
							
								
									8b5e5173d0
								
							
						
					
					
						commit
						511329c30a
					
				|  | @ -102,4 +102,4 @@ class SocialLoginView(LoginView): | |||
|     ------------- | ||||
|     """ | ||||
| 
 | ||||
|     serializer_class = SocialLoginSerializer | ||||
|     serializer_class = SocialLoginSerializer | ||||
|  |  | |||
|  | @ -25,4 +25,4 @@ def jwt_encode(user): | |||
|     jwt_encode_handler = api_settings.JWT_ENCODE_HANDLER | ||||
| 
 | ||||
|     payload = jwt_payload_handler(user) | ||||
|     return jwt_encode_handler(payload) | ||||
|     return jwt_encode_handler(payload) | ||||
|  |  | |||
|  | @ -175,4 +175,4 @@ class PasswordChangeView(GenericAPIView): | |||
|         serializer = self.get_serializer(data=request.data) | ||||
|         serializer.is_valid(raise_exception=True) | ||||
|         serializer.save() | ||||
|         return Response({"success": "New password has been saved."}) | ||||
|         return Response({"success": "New password has been saved."}) | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user