-
Marc Gravell authored
# Conflicts: # StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.csproj # StackExchange.Redis/StackExchange.Redis.csproj # StackExchange.Redis/StackExchange/Redis/SocketManager.cs
f7da2ce1
# Conflicts: # StackExchange.Redis.StrongName/StackExchange.Redis.StrongName.csproj # StackExchange.Redis/StackExchange.Redis.csproj # StackExchange.Redis/StackExchange/Redis/SocketManager.cs