From 57c0a9b54505b34e1dd5eca6c730c55647db9f58 Mon Sep 17 00:00:00 2001
From: zcx <1078327420@qq.com>
Date: Sun, 3 Dec 2023 22:26:32 +0800
Subject: [PATCH] Squashed commit of the following:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

commit 49653c1b673c83c732283d4bd34ca229f7fa377d
Author: pq3fnjual <1078327420@qq.com>
Date:   Fri Dec 1 17:18:07 2023 +0800

    Delete 'doc/实践模板-开源软件的质量分析报告文档.docx'

commit 48c04abb76b20051cc53aac87e5bc217a5641e27
Author: pq3fnjual <1078327420@qq.com>
Date:   Fri Dec 1 17:17:59 2023 +0800

    Delete 'doc/实践模板-开源软件泛读、标注和维护报告文档.docx'

commit 3c855701775f3c645e5bf4a60f04a7f67fff5237
Author: zcx <1078327420@qq.com>
Date:   Fri Dec 1 17:13:15 2023 +0800

    原版本的小米便签

commit 6a663ac3554c092256bc1f2154020f41708f14bd
Author: pq3fnjual <1078327420@qq.com>
Date:   Thu Nov 23 09:27:13 2023 +0800

    Delete 'qxn_branch.doc'

commit 964c8a74f79df6c6f99dc339bdb2e144007f17c5
Merge: 34ca0af ce00991
Author: pq3fnjual <1078327420@qq.com>
Date:   Thu Nov 23 09:25:47 2023 +0800

    Merge pull request '能看到吗22' (#2) from qxn-test into main

commit 34ca0afcdb1b0c83ce9b9c16a14c320018d263ee
Author: p6k2o3wg5 <860289024@qq.com>
Date:   Thu Nov 23 09:19:45 2023 +0800

    Update README.md

commit ce0099103186754e4f88569a2f3559a6de53b2a4
Author: p6k2o3wg5 <860289024@qq.com>
Date:   Thu Nov 23 09:14:49 2023 +0800

    ADD file via upload

commit e9fcd472f4ce96299174d642087c48d816f5d52f
Author: zcx <1078327420@qq.com>
Date:   Thu Nov 23 08:57:28 2023 +0800

    1

# Conflicts:
#	README.md
#	src/1.txt
---
 README.md | 2 --
 src/1.txt | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 README.md

diff --git a/README.md b/README.md
deleted file mode 100644
index 07603ab..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Minotes
-555
diff --git a/src/1.txt b/src/1.txt
index 522c5ff..86516c7 100644
--- a/src/1.txt
+++ b/src/1.txt
@@ -1 +1 @@
-曾晨曦_branch
\ No newline at end of file
+������_branch