From 791f0ddc42e70c7c705472fe018929c1601a4922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=94=E6=98=8E=E5=B7=9D?= <2858209755@qq.com>
Date: Tue, 19 Mar 2024 19:22:24 +0800
Subject: [PATCH] myfile1

---
 111.txt | 5 +++++
 cmc.txt | 5 -----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 111.txt

diff --git a/111.txt b/111.txt
new file mode 100644
index 0000000..341a1ba
--- /dev/null
+++ b/111.txt
@@ -0,0 +1,5 @@
+<<<<<<< HEAD
+nihao!!
+=======
+123456
+>>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486
diff --git a/cmc.txt b/cmc.txt
index 341a1ba..e69de29 100644
--- a/cmc.txt
+++ b/cmc.txt
@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-nihao!!
-=======
-123456
->>>>>>> 7f0713c0cf34d60e728087da8ecc86268339b486