fix conflicts

This commit is contained in:
geekan 2023-12-26 01:40:53 +08:00
commit 25de7f9a74
2 changed files with 2 additions and 4 deletions

View file

@ -142,6 +142,4 @@ TIMEOUT: 60 # Timeout for llm invocation
#REDIS_PASSWORD: "YOUR_REDIS_PASSWORD"
#REDIS_DB: "YOUR_REDIS_DB_INDEX, str, 0-based"
=======
# DISABLE_LLM_PROVIDER_CHECK: false
>>>>>>> main