# Conflicts: # src/Umbraco.Core/Umbraco.Core.csproj # src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html
# Conflicts: # src/Umbraco.Core/Umbraco.Core.csproj # src/Umbraco.Web.UI.Client/src/views/propertyeditors/integer/integer.html