From 55f12ac1d34725f4da61c48e880cd321f9788019 Mon Sep 17 00:00:00 2001
From: ERT <rcpitop@gmail.com>
Date: Thu, 24 Jul 2025 23:01:10 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=80=E4=B8=8B=E4=B9=B1?=
 =?UTF-8?q?=E7=9A=84=E5=9C=B0=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 47d91ee..7baf3e4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-# traepro-videoserver
-
-=======
 # Trae Video Server
 
 一个基于Electron的专业视频采集和流媒体服务程序，支持实时视频预览和网络流媒体分发。