furyhawk/deer-flow
1
0
Fork 0
mirror of https://github.com/bytedance/deer-flow.git synced 2026-05-25 09:26:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: resolve merge conflict in .env.example

Browse Source 
Keep both DATABASE_URL (from persistence-scaffold) and WECOM
credentials (from main) after the merge.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
rayhpeng
2026-04-05 21:52:05 +08:00
parent 8a6ed365aa
commit 7fdf9cad99
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.example
+1 -3
View File
@@ -32,11 +32,9 @@ INFOQUEST_API_KEY=your-infoquest-api-key
# GitHub API Token # GitHub API Token
# GITHUB_TOKEN=your-github-token # GITHUB_TOKEN=your-github-token
<<<<<<< HEAD
# Database (only needed when config.yaml has database.backend: postgres) # Database (only needed when config.yaml has database.backend: postgres)
# DATABASE_URL=postgresql://deerflow:password@localhost:5432/deerflow # DATABASE_URL=postgresql://deerflow:password@localhost:5432/deerflow
======= #
# WECOM_BOT_ID=your-wecom-bot-id # WECOM_BOT_ID=your-wecom-bot-id
# WECOM_BOT_SECRET=your-wecom-bot-secret # WECOM_BOT_SECRET=your-wecom-bot-secret
>>>>>>> main