fix merge conflicts

b7cda54b · liaogang · ad789814 · 492730b8 · b7cda54b
显示空白变更内容
内联并排

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