fix(web): conflict resolve

2026-01-30 17:09:05 +08:00
parent cd4661e878
commit 838bd46e83
2 changed files with 2 additions and 1 deletions
--- a/web/src/i18n/en.ts
+++ b/web/src/i18n/en.ts
@@ -2466,6 +2466,7 @@ Memory Bear: After the rebellion, regional warlordism intensified for several re
      extract: 'Project Inference',
      source: 'Not Added',
      target: 'Added',
+    },
    prompt: {
      editor: 'Prompt Generator',
      history: 'My History',
--- a/web/src/i18n/zh.ts
+++ b/web/src/i18n/zh.ts
@@ -2555,7 +2555,7 @@ export const zh = {
      extract: '工程推理',
      source: '未添加项',
      target: '已添加项',
-    }
+    },
    prompt: {
      editor: '提示词生成器',
      history: '我的历史',