# Conflicts: # .gitignore # build/UmbracoVersion.txt # src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js # src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# Conflicts: # .gitignore # build/UmbracoVersion.txt # src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js # src/Umbraco.Web.UI/Umbraco.Web.UI.csproj