# Conflicts:
#	NRediSearch.Test/RediSearchTestBase.cs
#	NRediSearch/AggregationResult.cs
#	NRediSearch/AssemblyInfo.cs
#	NRediSearch/Client.cs
#	NRediSearch/NRediSearch.csproj