Update README.md

2024-11-04 10:48:44 +08:00
1 changed files with 1 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -1,10 +1,8 @@
-<<<<<<< HEAD
+
 # xiuosIoT-web

 English | [简体中文](./README-zh.md)

-> A minimal low code template with Element UI & axios & iconfont & permission control & lint
-
 **Live demo:** http://115.238.53.59:9898/