수정

2023-08-21 11:10:44 +09:00
parent 999eaad9e6
commit 791d88ded2
1 changed files with 0 additions and 4 deletions
--- 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=";