diff --git a/src/test.txt b/src/test.txt
index 784265fe..70ec5675 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-conflict fix
+修复配置方式