fix: resolve merge conflict in ServerTableRow imports

This commit is contained in:
Logan committed 2026-06-18 11:47:30 +08:00
1 parent cdb978fcfc
commit 2f4c0df0f2
1 file changed
+1 -5
@@ -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 {