diff --git a/src/test.txt b/src/test.txt
index 8ca0abc0..d2a35820 100644
--- a/src/test.txt
+++ b/src/test.txt
@@ -1 +1 @@
-修改license_detail接口 bug
+Merge remote-tracking branch 'origin/master'