From 80c976033056f0a95e880e6ca0cb91fa52f4bf49 Mon Sep 17 00:00:00 2001
From: xuemingzhuo <xuemingzhuo@dlsdck.com>
Date: Thu, 13 Feb 2025 17:49:34 +0800
Subject: [PATCH] -c

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 29909f0..01f6552 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
--bmaster-003
-=======
--amaster-003
->>>>>>> 0b221ceeb840b8d77aebe8a3be205aa8e62b856f
+-c
\ No newline at end of file