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.AssemblyInfo.cs
View file

@ -15,7 +15,11 @@ using System.Reflection;
[assembly: System.Reflection.AssemblyCompanyAttribute("BMA.EHR.Recruit.Service")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d7bfacb34ef93e51cfa16ab565056a2fc541c6e2")]
=======
[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+54661ffbcbab112899e31b0397a986a02a1a7b98")]
>>>>>>> working
[assembly: System.Reflection.AssemblyProductAttribute("BMA.EHR.Recruit.Service")]
[assembly: System.Reflection.AssemblyTitleAttribute("BMA.EHR.Recruit.Service")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]