Bot functionsa mainly operational

touchh/settings.py

@@ -87,17 +87,10 @@ 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