From 7fdf9cad996c2468884f5d81dbc9397858467c17 Mon Sep 17 00:00:00 2001
From: rayhpeng <rayhpeng@gmail.com>
Date: Sun, 5 Apr 2026 21:52:05 +0800
Subject: [PATCH] fix: resolve merge conflict in .env.example

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>
---
 .env.example | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.env.example b/.env.example
index d926e6cde..377026980 100644
--- a/.env.example
+++ b/.env.example
@@ -32,11 +32,9 @@ INFOQUEST_API_KEY=your-infoquest-api-key
 
 # GitHub API Token
 # GITHUB_TOKEN=your-github-token
-<<<<<<< HEAD
 
 # Database (only needed when config.yaml has database.backend: postgres)
 # DATABASE_URL=postgresql://deerflow:password@localhost:5432/deerflow
-=======
+#
 # WECOM_BOT_ID=your-wecom-bot-id
 # WECOM_BOT_SECRET=your-wecom-bot-secret
->>>>>>> main