fix merge

Signed-off-by: Bensuperpc <bensuperpc@gmail.com>
This commit is contained in:
2021-08-05 17:33:52 +02:00
14 changed files with 790 additions and 2 deletions

View File

@@ -23,6 +23,10 @@ cd /tmp
# Todo: Need to update base image from Debian Stretch for the required Python
# 3.6 or later
curl -# -LO https://bootstrap.pypa.io/pip/get-pip.py
<<<<<<< HEAD
=======
#curl -# -LO https://bootstrap.pypa.io/pip/2.7/get-pip.py
>>>>>>> 9adf96c16b00759a9f7f69be3e61b5e16cdd6ac4
${PYTHON} get-pip.py --ignore-installed
rm get-pip.py