From 425671248a94ff1c8563d8150f3e9e6ab65b5ad4 Mon Sep 17 00:00:00 2001
From: WYS <573869201@qq.com>
Date: Thu, 8 Aug 2024 11:43:57 +0800
Subject: [PATCH] br1

---
 a.txt | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/a.txt b/a.txt
index d7b00b8..e69de29 100644
--- a/a.txt
+++ b/a.txt
@@ -1,6 +0,0 @@
-aaaa
-<<<<<<< HEAD
-br2
-=======
-br1
->>>>>>> br1