From 73af8d785f1c29e677c09d57207c2db51689dcdc Mon Sep 17 00:00:00 2001
From: Luo Tao <luotao02@baidu.com>
Date: Wed, 3 May 2017 13:53:11 +0800
Subject: [PATCH] fix conflict

---
 python/setup.py.in | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/python/setup.py.in b/python/setup.py.in
index 2ec0841b1..5dfb46192 100644
--- 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}'
       }
-- 
GitLab