readme更新

2024-09-04 16:48:23 +08:00 · 2024-09-04 16:48:23 +08:00 · d4386f4480
parent 1a5908acfb 2df44d76b4
commit d4386f4480
1 changed files with 0 additions and 4 deletions
--- a/README.md
+++ b/README.md
@ -1,10 +1,7 @@
-<<<<<<< HEAD
 # local_alert

 本地告警页面
 =======
-# alarm_managerment
-
 ## Project Setup

 ```sh
@ -263,4 +260,3 @@ export default router;

 #### Layout.vue

->>>>>>> master