From 4a8b1b4a8422773008e3dfe32b905ecc618979ad Mon Sep 17 00:00:00 2001
From: WYS <573869201@qq.com>
Date: Thu, 8 Aug 2024 11:45:55 +0800
Subject: [PATCH] Squashed commit of the following:

commit 568fe7004165ff828b14fde892aeb65931fc6423
Author: WYS <573869201@qq.com>
Date:   Thu Aug 8 11:34:55 2024 +0800

    br2

# Conflicts:
#	a.txt
---
 a.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/a.txt b/a.txt
index e69de29..9807a19 100644
--- a/a.txt
+++ b/a.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+=======
+aaaa
+br2
+>>>>>>> br2