# Conflicts: # .gitignore # build/UmbracoVersion.txt # src/SolutionInfo.cs # src/Umbraco.Core/Configuration/UmbracoVersion.cs # src/Umbraco.Web.UI/Umbraco.Web.UI.csproj # src/Umbraco.Web.UI/umbraco/config/lang/en.xml # src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx