fix conflict

73af8d78 · Luo Tao · c810e6a7 · 73af8d78
隐藏空白更改
内联并排

Showing with 1 addition and 3 deletion

python/setup.py.in python/setup.py.in +1 -3

未找到文件。
--- a/python/setup.py.in
+++ b/python/setup.py.in
@@ -15,13 +15,11 @@ setup(name='paddle',
      description='Parallel Distributed Deep Learning',
      install_requires=[
          "requests",
-      ],
-      packages=packages,
-      install_requires=[
          "numpy",
          "protobuf==${PROTOBUF_VERSION}",
          "matplotlib",
      ],
+      packages=packages,
      package_dir={
          '': '${CMAKE_CURRENT_SOURCE_DIR}'
      }