admin/CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(config): resolve appsettings.json merge conflict markers on production
Build and Deploy to Production / build-and-deploy (push) Failing after 1s
Details

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
masoodafar-web
2026-09-22 21:21:09 +03:30
parent 5c852e499d
commit 39bbe59bbc
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/CMSMicroservice.WebApi/appsettings.json
-9
View File
@@ -2,10 +2,7 @@
"PaymentProvider": "zarinpal", "PaymentProvider": "zarinpal",
"ZarinPal": { "ZarinPal": {
"MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8", "MerchantId": "4225d555-5fa9-4df0-9b61-1ce152cbbba8",
<<<<<<< HEAD
"UseSandbox": false "UseSandbox": false
=======
"UseSandbox": true
}, },
"TwentyCard": { "TwentyCard": {
"BaseUrl": "https://gateway.20card.ir/ipg", "BaseUrl": "https://gateway.20card.ir/ipg",
@@ -25,12 +22,6 @@
} }
} }
}, },
"CmsBaseUrl": "https://localhost:32846",
"FrontOfficeBaseUrl": "http://localhost:5268",
"FMS": {
"Address": "https://dl.afrino.co"
>>>>>>> kub-stage
},
"CmsBaseUrl": "https://cms.kbs2.ir", "CmsBaseUrl": "https://cms.kbs2.ir",
"FrontOfficeBaseUrl": "https://kbs2.ir", "FrontOfficeBaseUrl": "https://kbs2.ir",
"JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=", "JwtSecurityKey": "TvlZVx5TJaHs8e9HgUdGzhGP2CIidoI444nAj+8+g7c=",