sMerge branch 'master' of git.smartsoltech.kr:trevor/touchh_bot

2024-12-06 15:06:26 +09:00
parent a7706e9fb5 c77f46fdff
commit 02c1d79169
5 changed files with 89 additions and 50 deletions
--- a/touchh/settings.py
+++ b/touchh/settings.py
@@ -87,10 +87,17 @@ DATABASES = {
    'wordpress': {
        'ENGINE': 'django.db.backends.mysql',
        'NAME': 'u1510415_wp832',
+<<<<<<< HEAD
        'USER': 'root',
        'PASSWORD': 'R0sebud',
        'HOST': '0.0.0.0',
        'PORT': '3308',
+=======
+        'USER': 'u1510415_wp832',
+        'PASSWORD': 'yZ1gV6kH6lzD2cQ3',
+        'HOST': 'server231.hosting.reg.ru',
+        'PORT': '3306',
+>>>>>>> cea14d40d73e3a67c30dda8765458d91652e6bf4
    },
 }
 # Password validation