411bbcc192
# Conflicts: # build/UmbracoVersion.txt # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Core/Services/ContentService.cs # src/Umbraco.Core/Services/ContentTypeService.cs # src/Umbraco.Core/Services/DataTypeService.cs # src/Umbraco.Core/Services/MacroService.cs # src/Umbraco.Core/Services/MediaService.cs # src/Umbraco.Core/Services/MemberService.cs # src/Umbraco.Core/Services/MemberTypeService.cs # src/Umbraco.Core/Services/UserService.cs # src/Umbraco.Web/Umbraco.Web.csproj