From f01d89ab652b43153ac6ab22df25eea90719ffa9 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期四, 11 四月 2024 16:11:55 +0800 Subject: [PATCH] 图书资源内无文件图标显示(暂无默认图标吗,先显示个word) --- 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