Squashed commit of the following:

commit 568fe70041 Author: WYS <573869201@qq.com> Date: Thu Aug 8 11:34:55 2024 +0800 br2 # Conflicts: # a.txt
4 months ago · 4a8b1b4a84
parent 425671248a
commit 4a8b1b4a84
1 changed files with 5 additions and 0 deletions
--- a/a.txt
+++ b/a.txt
@ -0,0 +1,5 @@
+<<<<<<< HEAD
+=======
+aaaa
+br2
+>>>>>>> br2