Fixes merge conflict

iMerica · Mar 26, 2023 · cdea4fa · cdea4fa
1 parent 517dacc
commit cdea4fa
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/dj_rest_auth/serializers.py b/dj_rest_auth/serializers.py
@@ -288,17 +288,10 @@ def validate(self, attrs):
             uid = force_str(uid_decoder(attrs['uid']))
             self.user = UserModel._default_manager.get(pk=uid)
         except (TypeError, ValueError, OverflowError, UserModel.DoesNotExist):
-<<<<<<< HEAD
             raise ValidationError({'uid': [_('Invalid value.')]})
 
         if not default_token_generator.check_token(self.user, attrs['token']):
             raise ValidationError({'token': [_('Invalid value.')]})
-=======
-            raise ValidationError({'uid': [_('Invalid value')]})
-
-        if not default_token_generator.check_token(self.user, attrs['token']):
-            raise ValidationError({'token': [_('Invalid value')]})
->>>>>>> master
 
         self.custom_validation(attrs)
         # Construct SetPasswordForm instance