From 2f4c0df0f27b2bc2564ad66e954aae312a00583b Mon Sep 17 00:00:00 2001
From: Logan <admin@attacker.club>
Date: Thu, 18 Jun 2026 11:47:30 +0800
Subject: [PATCH] fix: resolve merge conflict in ServerTableRow imports

---
 frontend/src/components/server/ServerTableRow.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/frontend/src/components/server/ServerTableRow.tsx b/frontend/src/components/server/ServerTableRow.tsx
index 00a8990..812d028 100644
--- a/frontend/src/components/server/ServerTableRow.tsx
+++ b/frontend/src/components/server/ServerTableRow.tsx
@@ -12,11 +12,7 @@ import {
   DropdownMenuTrigger,
 } from '@/components/ui/dropdown-menu';
 import { TableCell, TableRow } from '@/components/ui/table';
-<<<<<<< HEAD
-import { Edit, MoreHorizontal, Server as ServerIcon, Terminal, Trash2, Download } from 'lucide-react';
-=======
-import { Cpu, Edit, MoreHorizontal, Server as ServerIcon, Terminal, Trash2 } from 'lucide-react';
->>>>>>> ca18ead (feat: run.sh四模式(dev/docker/build/binary) + CLI flags + Redka内嵌Redis + Agent复制修复 + 服务器编辑IP字段 + 安装Agent按钮)
+import { Cpu, Edit, MoreHorizontal, Server as ServerIcon, Terminal, Trash2 } from "lucide-react";
 import { getStatusBadge, getTags, getUsageColor } from './serverHelpers';
 
 interface ServerTableRowProps {