From e66635648371fc859c09945707313c1fe72b8d68 Mon Sep 17 00:00:00 2001 From: erio Date: Mon, 9 Feb 2026 18:12:39 +0800 Subject: [PATCH] fix: resolve merge conflict in OpsConcurrencyCard.vue --- .../src/views/admin/ops/components/OpsConcurrencyCard.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/frontend/src/views/admin/ops/components/OpsConcurrencyCard.vue b/frontend/src/views/admin/ops/components/OpsConcurrencyCard.vue index 87f6a4d8..ca640ade 100644 --- a/frontend/src/views/admin/ops/components/OpsConcurrencyCard.vue +++ b/frontend/src/views/admin/ops/components/OpsConcurrencyCard.vue @@ -162,10 +162,6 @@ const groupRows = computed((): SummaryRow[] => { total_accounts: totalAccounts, available_accounts: availableAccounts, rate_limited_accounts: safeNumber(avail.rate_limit_count), -<<<<<<< HEAD -======= - ->>>>>>> v0.1.76 error_accounts: safeNumber(avail.error_count), total_concurrency: totalConcurrency, used_concurrency: usedConcurrency,