# Conflicts:
#	Rock.ViewModels/Blocks/Security/LoginHistory/LoginHistoryInitializationBox.cs
#	Rock/Communication/Chat/ChatHelper.cs
#	Rock/Communication/Chat/Stream/StreamChatProvider.cs
#	Rock/Rock.csproj
#	Rock/SystemGuid/ServiceJob.cs