From bed58af120b209633b9804d52d859b3b1b8872dd Mon Sep 17 00:00:00 2001 From: Vikas Nale Date: Mon, 31 Mar 2025 12:27:43 +0530 Subject: [PATCH] resolvev merge coflict --- Marco.Pms.Services/appsettings.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Marco.Pms.Services/appsettings.json b/Marco.Pms.Services/appsettings.json index c10eaa4..d1138dc 100644 --- a/Marco.Pms.Services/appsettings.json +++ b/Marco.Pms.Services/appsettings.json @@ -6,18 +6,11 @@ } }, "ConnectionStrings": { - // "DefaultConnectionString": "Server=103.50.160.45;User ID=marcowvh_admin;Password=Marcoemp@123;Database=marcowvh_empattendanceci", -<<<<<<< Updated upstream - //"DefaultConnectionString": "Server=localhost;port=3333;User ID=root;Password=root;Database=MarcoBMS1", - "DefaultConnectionString": "Server=147.93.98.152;User ID=root;Password=MySqlUser@123$;Database=MarcoBMS1" -======= "DefaultConnectionString": "Server=localhost;port=3306;User ID=root;Password=root;Database=MarcoBMS1", - //"DefaultConnectionString": "Server=147.93.98.152;User ID=devuser;Password=AppUser@123$;Database=MarcoBMS1" }, "AppSettings": { "WebFrontendUrl": "http://localhost:5173", "ImagesBaseUrl": "http://localhost:5173" ->>>>>>> Stashed changes }, "AllowedHosts": "*", "Jwt": {