From e59a71579f6afd21c76f9d45c3b3f09c28d03c41 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 27 五月 2024 14:37:22 +0800
Subject: [PATCH] 合并冲突

---
 src/components/view/system-log.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/view/system-log.vue b/src/components/view/system-log.vue
index a415609..519b37c 100644
--- a/src/components/view/system-log.vue
+++ b/src/components/view/system-log.vue
@@ -106,4 +106,4 @@
 			}
 		}
 	}
-</script>
+</script>
\ No newline at end of file

--
Gitblit v1.9.3