更新至V1.67，更新内容在笔记中查看

2026-04-22 06:11:40 +08:00 · 2023-01-15 20:49:00 +08:00
parent a9cce6dcd9 ea30bc60ea
commit 54b0d7730d
2 changed files with 6 additions and 0 deletions
--- a/core/template/default/common/showmessage.htm
+++ b/core/template/default/common/showmessage.htm
@@ -171,4 +171,8 @@
 	<!--{template common/footer}-->
 <!--{else}-->
 	<!--{template common/footer_ajax}-->
+<<<<<<< HEAD
 <!--{/if}-->
+=======
+<!--{/if}-->
+>>>>>>> ea30bc60ea27a7f1ef0fa26c90af2abdd1ee14d9