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

Merge branch 'develop' into working

Browse source 
# Conflicts:
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.dll
#	bin/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
#	obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json
#	obj/BMA.EHR.Recruit.Service.csproj.nuget.g.props
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.GeneratedMSBuildEditorConfig.editorconfig
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.AssemblyReference.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.csproj.CoreCompileInputs.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.genruntimeconfig.cache
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.pdb
#	obj/Debug/net7.0/Sentry.Attributes.cs
#	obj/Debug/net7.0/ref/BMA.EHR.Recruit.Service.dll
#	obj/Debug/net7.0/refint/BMA.EHR.Recruit.Service.dll
#	obj/project.assets.json
#	obj/project.nuget.cache
This commit is contained in:
Suphonchai Phoonsawat 2023-03-24 15:17:09 +07:00
commit e33c19ae8a
18 changed files with 508 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
obj/Debug/net7.0/Sentry.Attributes.cs
View file

@ -11,7 +11,11 @@
using System;
using System.Reflection;
<<<<<<< HEAD
[assembly: System.Reflection.AssemblyMetadata("Sentry.ProjectDirectory", "D:\\Develop\\Source\\BMA-EHR-Recruit-Service\\")]
=======
[assembly: System.Reflection.AssemblyMetadata("Sentry.ProjectDirectory", "/Users/suphonchai/Develop/Source/BMA-EHR/BMA-EHR-Recruit-Service/")]
>>>>>>> develop
// Generated by the MSBuild WriteCodeFragment class.