From bcd706eeb0c7f9e36ee4803386e52ce2bc0510f6 Mon Sep 17 00:00:00 2001 From: yiming <m13691596795@163.com> Date: 星期三, 06 三月 2024 09:28:26 +0800 Subject: [PATCH] feat(s): 大山 --- 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