diff --git a/src/test.txt b/src/test.txt index 52357379..c9664b94 100644 --- a/src/test.txt +++ b/src/test.txt @@ -1 +1 @@ -Merge branch 'develop' of https \ No newline at end of file +Merge pull request '适配云脑接口修改' (#158) from fix-getimageinfo into develop