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:
#	.vs/BMA.EHR.Recruit.Service/v17/.suo
#	obj/BMA.EHR.Recruit.Service.csproj.nuget.dgspec.json
#	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.GeneratedMSBuildEditorConfig.editorconfig
#	obj/Debug/net7.0/BMA.EHR.Recruit.Service.assets.cache
#	obj/Debug/net7.0/Sentry.Attributes.cs
#	obj/project.assets.json
#	obj/project.nuget.cache
This commit is contained in:
Suphonchai Phoonsawat 2025-03-31 13:12:47 +07:00
commit 315ceb261a
8 changed files with 48 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,10 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
<<<<<<< HEAD
// Runtime Version:4.0.30319.42000
=======
>>>>>>> develop
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.