aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-connectivity/python-gsocketpool
diff options
context:
space:
mode:
authorleimaohui <leimaohui@cn.fujitsu.com>2018-05-27 17:34:16 -0700
committerArmin Kuster <akuster808@gmail.com>2018-08-19 07:19:58 -0700
commitfa979a06a1e45c1209b614e32635a4b7c2b777eb (patch)
treee90d066e6b951171e4407bec36c2b0fe485fc807 /recipes-connectivity/python-gsocketpool
parentf219d791f9093861659e8ea69166c692921fcff3 (diff)
downloadmeta-python2-sumo-next.tar.gz
python-pytest: Fix conflict error as following:sumo-nextsumo
file /usr/bin/py.test conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0 file /usr/bin/pytest conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0 (From meta-openembedded commit: 7825bc0ed57c5da0fafd260b5e81346410582e33) Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 28fab4c8f547d45b80bb7b06d33a6c6c1ea74efc) Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Tim Orling <ticotimo@gmail.com>
Diffstat (limited to 'recipes-connectivity/python-gsocketpool')
0 files changed, 0 insertions, 0 deletions