|
71dd119efe
|
Merge branch 'patient_module' of https://git.sentientgeeks.us/ranjit/Hospital_Management into AppointmentModule_Modified
# 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
|
2025-02-04 13:16:44 +05:30 |
|