From 78c7b23c11e63e538b0c3cd7cbddbd280aeeb8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E5=91=98=E9=98=BF=E6=B1=9F=28Relakkes?=
 =?UTF-8?q?=29?= <relakkes@gmail.com>
Date: Thu, 9 Apr 2026 12:44:52 +0800
Subject: [PATCH] fix: remove leftover merge conflict marker in Settings.tsx

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 desktop/src/pages/Settings.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/desktop/src/pages/Settings.tsx b/desktop/src/pages/Settings.tsx
index b5dadf54..05cc39ac 100644
--- a/desktop/src/pages/Settings.tsx
+++ b/desktop/src/pages/Settings.tsx
@@ -614,7 +614,6 @@ function GeneralSettings() {
   )
 }
 
-<<<<<<< HEAD
 // ─── Agents Settings ──────────────────────────────────────
 
 const AGENT_COLORS: Record<string, string> = {