hrms-api-recruit/obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache

<<<<<<< HEAD
a61618443a29215c1780096c70a4c1cfa90e1df3e1f003527b38ce0ccd7b73fc
=======
d0b8ae708cff3fbb17ec6ef788cd76ed1d601b65c1136482d745d4fd3aa82acc
>>>>>>> working
Merge branch 'working' into develop # Conflicts: # .vs/BMA.EHR.Recruit.Service/DesignTimeBuild/.dtbcache.v2 # .vs/BMA.EHR.Recruit.Service/v17/.suo # bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll # bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe # bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt # obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll 2024-06-13 13:10:32 +07:00			`<<<<<<< HEAD`
fix before merge 2024-06-13 13:10:13 +07:00			`a61618443a29215c1780096c70a4c1cfa90e1df3e1f003527b38ce0ccd7b73fc`
Merge branch 'working' into develop # Conflicts: # .vs/BMA.EHR.Recruit.Service/DesignTimeBuild/.dtbcache.v2 # .vs/BMA.EHR.Recruit.Service/v17/.suo # bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll # bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe # bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt # obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll 2024-06-13 13:10:32 +07:00			`=======`
fix : defect 2024-06-13 12:56:28 +07:00			`d0b8ae708cff3fbb17ec6ef788cd76ed1d601b65c1136482d745d4fd3aa82acc`
Merge branch 'working' into develop # Conflicts: # .vs/BMA.EHR.Recruit.Service/DesignTimeBuild/.dtbcache.v2 # .vs/BMA.EHR.Recruit.Service/v17/.suo # bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll # bin/Debug/net7.0/BMA.EHR.Recruit.Service.exe # bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfo.cs # obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache # obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.FileListAbsolute.txt # obj/Debug/net7.0/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb # obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll # obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll 2024-06-13 13:10:32 +07:00			`>>>>>>> working`