# Conflicts: # CHANGELOG.md # ICD.Common.Utils/ICD.Common.Utils_SimplSharp.csproj # ICD.Common.Utils/PathUtils.cs # ICD.Common.Utils/ProcessorUtils.SimplSharp.cs # ICD.Common.Utils/Properties/AssemblyInfo.cs