1 files changed, 3 insertions, 0 deletions
diff --git a/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs b/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
index 94b582cde..9e1183c76 100644
--- a/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
+++ b/Jellyfin.Server.Implementations/Users/DefaultAuthenticationProvider.cs
@@ -117,6 +117,8 @@ namespace Jellyfin.Server.Implementations.Users
 
             return Task.CompletedTask;
         }
+<<<<<<< HEAD
+=======
 
         /// <inheritdoc />
         public void ChangeEasyPassword(User user, string newPassword, string newPasswordHash)
@@ -141,5 +143,6 @@ namespace Jellyfin.Server.Implementations.Users
                 ? null
                 : Hex.Encode(PasswordHash.Parse(user.EasyPassword).Hash);
         }
+>>>>>>> upstream/master
     }
 }