From 01f56c54a3cf53e5310e607bafebedd526648daf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BD=97=E5=B8=B8=E6=9C=89?= <2398732972@qq.com>
Date: Fri, 7 Apr 2023 08:21:14 +0800
Subject: [PATCH] exmple

---
 2.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/2.txt b/2.txt
index d069baf..a4729fb 100644
--- a/2.txt
+++ b/2.txt
@@ -4,4 +4,5 @@
 sssssssssss
 <<<<<<< HEAD
 dddddd
-mmmmmmm
\ No newline at end of file
+mmmmmmm
+llllllcccccyyyyyy
\ No newline at end of file