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

12
obj/project.assets.json
View file

@ -2564,6 +2564,7 @@
}
}
},
<<<<<<< HEAD
"NEST/7.17.5": {
"type": "package",
"dependencies": {
@ -2580,6 +2581,8 @@
}
}
},
=======
>>>>>>> develop
"NETStandard.Library/1.6.1": {
"type": "package",
"dependencies": {
@ -8270,6 +8273,7 @@
"mysqlconnector.nuspec"
]
},
<<<<<<< HEAD
"NEST/7.17.5": {
"sha512": "bo9UyuIoVRx4IUQiuC8ZrlZuvAXKIccernC7UUKukQCEmRq2eVIk+gubHlnMQljrP51q0mN4cjgy9vv5uZPkoA==",
"type": "package",
@ -8289,6 +8293,8 @@
"nuget-icon.png"
]
},
=======
>>>>>>> develop
"NETStandard.Library/1.6.1": {
"sha512": "WcSp3+vP+yHNgS8EV5J7pZ9IRpeDuARBPN28by8zqff1wJQXm26PVU8L3/fYLBJVU7BtDyqNVWq2KlCVvSSR4A==",
"type": "package",
@ -13710,7 +13716,10 @@
"Microsoft.VisualStudio.Azure.Containers.Tools.Targets >= 1.17.0",
"MongoDB.Driver >= 2.19.0",
"MongoDB.Driver.GridFS >= 2.19.0",
<<<<<<< HEAD
"NEST >= 7.17.5",
=======
>>>>>>> develop
"Newtonsoft.Json >= 13.0.3",
"Pomelo.EntityFrameworkCore.MySql >= 7.0.0",
"Pomelo.EntityFrameworkCore.MySql.Design >= 1.1.2",
@ -13837,10 +13846,13 @@
"target": "Package",
"version": "[2.19.0, )"
},
<<<<<<< HEAD
"NEST": {
"target": "Package",
"version": "[7.17.5, )"
},
=======
>>>>>>> develop
"Newtonsoft.Json": {
"target": "Package",
"version": "[13.0.3, )"