From 791d88ded201ba28d6b2ff513d5310ad20f5ec03 Mon Sep 17 00:00:00 2001 From: jhlee Date: Mon, 21 Aug 2023 11:10:44 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Million/CommonProperty.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Million/CommonProperty.cs b/Million/CommonProperty.cs index 313e10a..302e335 100644 --- a/Million/CommonProperty.cs +++ b/Million/CommonProperty.cs @@ -317,11 +317,7 @@ namespace Million //TODO 추후 관리 방안 고려 #region # 데이터 베이스 정보 # -<<<<<<< .mine - public const string DbServerIp = " 220.123.49.58"; -======= public const string DbServerIp = "220.123.49.58"; ->>>>>>> .theirs public const string DbServerUserId = "million"; public const string DbServerUserPassword = "million!"; public static string DbConnectionStr = $"Data Source={DbServerIp};uid={DbServerUserId};pwd={DbServerUserPassword};Database=";