Merge branch 'master' of https://gitlink.org.cn/wangmingqiang/gitlink_help_center

xf
2024-06-05 10:18:37 +08:00 · 2024-06-05 10:18:29 +08:00
2 changed files with 2 additions and 9 deletions
--- a/9
+++ b/9
@ -1,13 +1,6 @@
 FROM node:18-alpine
-<<<<<<< HEAD
-<<<<<<< HEAD
-LABEL maintainer="hejiayu <hejy47@nudt.edu.cn>"
-=======
+
 LABEL maintainer="wangmingqiang <wangmingqiang21@nudt.edu.cn>"
->>>>>>> 7de679ce30cca0042df81a002d7d36f9d90f49a5
-=======
-LABEL maintainer="wangmingqiang <wangmingqiang21@nudt.edu.cn>"
->>>>>>> origin/master

 WORKDIR /gitlink_help_center

--- a/docs/联系我们/联系.md
+++ b/docs/联系我们/联系.md
@ -16,4 +16,4 @@ sidebar_position: 1

 刘屹涛：119

-王明强：12011
+王明强：120
Author	SHA1	Message	Date
xiaofan	cd4a057407	Merge branch 'master' of https://gitlink.org.cn/wangmingqiang/gitlink_help_center	2024-06-05 10:18:37 +08:00
xiaofan	1e80f03218	xf	2024-06-05 10:18:29 +08:00