Merge branch 'master' into httpclient

1 files changed, 1 insertions, 2 deletions

diff --git a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
index 982bba625..6d7193ce2 100644
--- a/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
+++ b/Emby.Server.Implementations/Cryptography/CryptographyProvider.cs
@@ -4,7 +4,6 @@ using System.Globalization;
 using System.IO;
 using System.Security.Cryptography;
 using System.Text;
-using System.Linq;
 using MediaBrowser.Model.Cryptography;
 
 namespace Emby.Server.Implementations.Cryptography
@@ -136,7 +135,7 @@ namespace Emby.Server.Implementations.Cryptography
         {
             return PBKDF2(DefaultHashMethod, bytes, salt, _defaultIterations);
         }
-        
+
         public byte[] ComputeHash(PasswordHash hash)
         {
             int iterations = _defaultIterations;