# Conflicts: # ASC.Web.sln # common/ASC.Common/Security/Cryptography/InstanceCrypto.cs # common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs # web/ASC.Web.Api/ASC.Web.Api.csproj # web/ASC.Web.Api/Controllers/AuthenticationController.cs # web/ASC.Web.Api/Controllers/SettingsController.cs # web/ASC.Web.Api/Program.cs # web/ASC.Web.Api/Startup.cs