# Conflicts: # src/aspnet-core/ICS.Application/IcsApplicationModule.cs # src/aspnet-core/src/YoyoBoot.Core/Localization/SourceFiles/YoyoBoot-zh-Hans.json # src/aspnet-core/src/YoyoBoot.Web.Host/wwwroot/ConfigFiles/DynamicMenus/Menu.json # src/vue/src/shared/service-proxies/service-proxies.ts