From cd3e9a5f2256a923aa5eff6ecf94c66d4a7004dd Mon Sep 17 00:00:00 2001
From: potaser <h4erj@outlook.com>
Date: Sun, 9 Aug 2026 05:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E8=AF=AD=E8=A8=80+=E6=8B=93=E5=B1=95?=
 =?UTF-8?q?=E5=8C=85=E6=8B=96=E6=8B=BD=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/web/vue3/index.html | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/apps/web/vue3/index.html b/apps/web/vue3/index.html
index 48c906b6f..f2c7b5618 100644
--- a/apps/web/vue3/index.html
+++ b/apps/web/vue3/index.html
@@ -995,7 +995,7 @@
         }
 
         .execution-log-item.assistant .log-content.structured-content {
-            /* 结构化内容使用rag样式 */
+            font-size: 13px;
         }
 
         .execution-log-item.assistant .log-content.short-content {
@@ -1363,13 +1363,8 @@
 
                     <el-divider style="margin: 12px 0;"></el-divider>
 
-<<<<<<< HEAD
                     <div @dragover.prevent @drop.prevent="handleLightweightExtensionFolderDrop($event)"
                         style="padding:10px; background:#fff; border:1px dashed #409EFF; border-radius:0px;">
-=======
-                    <div @dragover.prevent @drop.prevent="handleLightweightExtensionFolderDrop($event)"
-                        style="padding:10px; background:#fff; border:1px dashed #409EFF; border-radius:0px;">
->>>>>>> 272d13b41 (多语言+拓展包拖拽上传)
                         <div style="display:flex; align-items:center; justify-content:space-between; gap:8px; margin-bottom:8px;">
                             <el-tooltip content="上传已跑通过的代码和测试数据；执行通过自然语言触发。" placement="top">
                                 <h4 style="margin:0; color:#303133; cursor:help;">拓展分析阶段</h4>