# Conflicts: # angular/src/app/proxy/generate-proxy.json # angular/src/app/proxy/index.ts # angular/src/app/proxy/volo/abp/domain/entities/auditing/models.ts # angular/src/app/proxy/volo/abp/domain/entities/models.ts # aspnet-core/src/HospitalManagementSystem.EntityFrameworkCore/EntityFrameworkCore/HospitalManagementSystemDbContext.cs # aspnet-core/src/HospitalManagementSystem.EntityFrameworkCore/Migrations/HospitalManagementSystemDbContextModelSnapshot.cs