From 0bbc91dbf3a58da857ef098b34f9d2f86361c766 Mon Sep 17 00:00:00 2001 From: 闫增涛 <1829501689@qq.com> Date: 星期四, 11 四月 2024 17:56:46 +0800 Subject: [PATCH] 答题器图标替换,图书分类页骨架屏样式修改 --- 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