diff --git a/src/test.txt b/src/test.txt
index 8cff035f..e135cb23 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-Merge pull request '云脑二专属资源池' (#2582) from V20220718.patch into V20220801
+解决冲突