fix conflict

8 years ago · 73af8d785f
parent c810e6a7c0
commit 73af8d785f
1 changed files with 1 additions and 3 deletions
--- 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}'
      }