Merge pull request #2082 from gangliao/new_rel

fix conflicts

Merge pull request #2082 from gangliao/new_rel
fix conflicts
1b83092d · gangliao · GitHub · ad789814 · b7cda54b · 1b83092d
显示空白变更内容
内联并排

Showing with 2 addition and 2 deletion

doc/api/v1/data_provider/pydataprovider2_en.rst doc/api/v1/data_provider/pydataprovider2_en.rst +2 -2

未找到文件。
--- a/doc/api/v1/data_provider/pydataprovider2_en.rst
+++ b/doc/api/v1/data_provider/pydataprovider2_en.rst