Conflict fixed

.env

@@ -12,7 +12,7 @@
 #--------------------------------------------------------------------
 # ENVIRONMENT
 #--------------------------------------------------------------------
-APP_SERVER_NAME = "TEST-SERVER-01"
+APP_SERVER_NAME = "DEV-LOCAL-01"
 CI_ENVIRONMENT = development
 # CI_ENVIRONMENT = production
 #--------------------------------------------------------------------
@@ -23,6 +23,8 @@ app.baseURL = 'http://test2-admin.confirms.co.kr/'
 # app_baseURL = ''
 # app.forceGlobalSecureRequests = false
 # app.CSPEnabled = false
+app.forceGlobalSecureRequests = false
+app.appTimezone = 'Asia/Seoul'
 #--------------------------------------------------------------------
 # DATABASE
 #--------------------------------------------------------------------
@@ -33,6 +35,9 @@ database.default.password = zjsvjatm
 database.default.DBDriver = MySQLi
 database.default.DBPrefix =
 database.default.port = 3306
+database.default.timezone = '+09:00'
+database.tests.charset = utf8mb4
+database.tests.DBCollat = utf8mb4_general_ci
 # If you use MySQLi as tests, first update the values of Config\Database::$tests.
 # database.tests.hostname = localhost
 # database.tests.database = ci4_test

.gitignore

@@ -169,4 +169,5 @@ _modules/*
 # 특정 IDE나 빌드 도구가 생성하는 파일은 추가합니다.
 /build/
 /dist/
-/node_modules/
+/node_modules/
+.env