jsek-applet.git

main / jsek-applet

京师E课小程序

概况
操作记录
提交次数
目录
文档
派生
对比

blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace

问题修改

litian

2024-04-01 6a7e1f5b8a08728860140652d442209f810d58e1

 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>

			@@ -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>