fix conflicts

This commit is contained in:
jiandanfeng 2025-02-18 03:44:10 +00:00
parent efe0ed5d52
commit b4c26c86c3

View File

@ -59,7 +59,6 @@ services:
REDIS_USE_SSL: 'false'
# use redis db 0 for redis cache
REDIS_DB: 0
REDIS_KEY_PREFIX: ''
# The configurations of celery broker.
# Use redis as the broker, and redis db 1 for celery broker.
CELERY_BROKER_URL: redis://:difyai123456@redis:6379/1
@ -255,7 +254,6 @@ services:
REDIS_USERNAME: ''
REDIS_PASSWORD: difyai123456
REDIS_DB: 0
REDIS_KEY_PREFIX: ''
REDIS_USE_SSL: 'false'
# The configurations of celery broker.
CELERY_BROKER_URL: redis://:difyai123456@redis:6379/1