From 7ebd4cebbdec2173fba7345285c0ed6d62043995 Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期四, 29 二月 2024 19:27:33 +0800 Subject: [PATCH] 冲突 --- pages/personalCenter/certificate/index.js | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/pages/personalCenter/certificate/index.js b/pages/personalCenter/certificate/index.js index e949fd5..319aa9b 100644 --- a/pages/personalCenter/certificate/index.js +++ b/pages/personalCenter/certificate/index.js @@ -1,4 +1,7 @@ - +<<<<<<< HEAD +======= +// pages/personalCenter/certificate/index.js +>>>>>>> master Page({ /** -- Gitblit v1.9.1