From f1e20feafa89c8d50af5e69c0333a9efc239ee49 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期一, 01 四月 2024 14:09:11 +0800 Subject: [PATCH] 图书详情页bug修改，我的错题、收藏模式下答题卡添加题目类型，非单选题添加查看解析按钮 --- pages/personalCenter/certificate/index.wxml | 11 +---------- 1 files changed, 1 insertions(+), 10 deletions(-) diff --git a/pages/personalCenter/certificate/index.wxml b/pages/personalCenter/certificate/index.wxml index a5dcc42..715d10c 100644 --- a/pages/personalCenter/certificate/index.wxml +++ b/pages/personalCenter/certificate/index.wxml @@ -1,11 +1,2 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= <!--pages/personalCenter/certificate/index.wxml--> -<text>pages/personalCenter/certificate/index.wxml</text> ->>>>>>> master -======= -<!--pages/personalCenter/certificate/index.wxml--> -<text>pages/personalCenter/certificate/index.wxml</text> ->>>>>>> master +<text>pages/personalCenter/certificate/index.wxml</text> \ No newline at end of file -- Gitblit v1.9.1