sdaduanbilei/cc-haha
1
0
Fork 0
mirror of https://github.com/NanmiCoder/cc-haha synced 2026-07-16 13:03:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: remove leftover merge conflict marker in Settings.tsx

Browse Source 
Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
程序员阿江(Relakkes) 2026-04-09 12:44:52 +08:00
parent 21ee8609d8
commit 78c7b23c11
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
desktop/src/pages/Settings.tsx
View File

@ -614,7 +614,6 @@ function GeneralSettings() {
)
}
<<<<<<< HEAD
// ─── Agents Settings ──────────────────────────────────────
const AGENT_COLORS: Record<string, string> = {