From 73f212b1fb05bb478d42a3e3108ff21a49572df7 Mon Sep 17 00:00:00 2001
From: HTWMedia <1005354833@qq.com>
Date: Wed, 24 Jul 2024 18:36:30 +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 d034240..34ca225 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<<<<<<< HEAD
+
 # HTV
 A live media player app（手机、电视直播软件）