From b4c26c86c37b4f11a5ac25e66f36d0d6591bfa0d Mon Sep 17 00:00:00 2001
From: jiandanfeng <chenjh3@wangsu.com>
Date: Tue, 18 Feb 2025 03:44:10 +0000
Subject: [PATCH] fix conflicts

---
 docker-legacy/docker-compose.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/docker-legacy/docker-compose.yaml b/docker-legacy/docker-compose.yaml
index 95c3b6c0dc..0a071e80b3 100644
--- a/docker-legacy/docker-compose.yaml
+++ b/docker-legacy/docker-compose.yaml
@@ -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