From aca388ab40d5743bbacb10758d94f4936f58f94d Mon Sep 17 00:00:00 2001
From: floraachy <1622042529@qq.com>
Date: Mon, 4 Nov 2024 10:47:00 +0800
Subject: [PATCH] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index df7bc0a..5e89f00 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 # xiuosIoT-web
 
 English | [简体中文](./README-zh.md)