From 912e1c414c61af310352163b107fa191e987f930 Mon Sep 17 00:00:00 2001
From: alfadb <alfadb@163.com>
Date: Tue, 18 Aug 2026 02:54:25 +0800
Subject: [PATCH] fix(opencode): remove stray conflict-marker text from usage
 cell imports

---
 frontend/src/components/account/AccountUsageCell.vue | 2 +-
 frontend/src/components/account/EditAccountModal.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/account/AccountUsageCell.vue b/frontend/src/components/account/AccountUsageCell.vue
index e3ce9bc74f..0e5615120c 100644
--- a/frontend/src/components/account/AccountUsageCell.vue
+++ b/frontend/src/components/account/AccountUsageCell.vue
@@ -666,7 +666,7 @@ import CNProviderQuotaCell from './CNProviderQuotaCell.vue'
 import CNProviderBalanceCell from './CNProviderBalanceCell.vue'
 import OllamaCloudUsageCell from './OllamaCloudUsageCell.vue'
 import { cnQuotaCellVisible as cnQuotaCellVisibleFn, cnBalanceCellVisible as cnBalanceCellVisibleFn } from './credentialsBuilder'
-import OpenCodeGoUsageCell from './OpenCodeGoUsageCell.vue' (feat(opencode): 支持 OpenCode Go 官方用量窗口查询与自动刷新)
+import OpenCodeGoUsageCell from './OpenCodeGoUsageCell.vue'
 
 // Module-level cache shared across all AccountUsageCell instances
 const _usageCache = new Map<number, { data: AccountUsageInfo; ts: number }>()
diff --git a/frontend/src/components/account/EditAccountModal.vue b/frontend/src/components/account/EditAccountModal.vue
index 8228103dd0..aced3a016d 100644
--- a/frontend/src/components/account/EditAccountModal.vue
+++ b/frontend/src/components/account/EditAccountModal.vue
@@ -3104,7 +3104,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, computed, watch, nextTick, onMounted } from 'vue' (feat(opencode): 支持 OpenCode Go 官方用量窗口查询与自动刷新)
+import { ref, reactive, computed, watch, nextTick, onMounted } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { useAppStore } from '@/stores/app'