hrms-bangkok/hrms-api-recruit
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'working' into develop

Browse source 
# 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
This commit is contained in:
Suphonchai Phoonsawat 2024-06-13 13:10:32 +07:00
commit 6b31a2a4a5
6 changed files with 34 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
obj/Debug/net7.0/BMA.EHR.Recruit.Service.AssemblyInfoInputs.cache
View file

@ -1 +1,5 @@
<<<<<<< HEAD
a61618443a29215c1780096c70a4c1cfa90e1df3e1f003527b38ce0ccd7b73fc
=======
d0b8ae708cff3fbb17ec6ef788cd76ed1d601b65c1136482d745d4fd3aa82acc
>>>>>>> working