infosecn1nja
/
Empire
mirror of https://github.com/infosecn1nja/Empire.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix conflict

master
xorrior 2018-05-04 12:19:51 -04:00
parent b90899627b
commit 1924c60336
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -45,11 +45,8 @@ RUN apt-get update && apt-get install -qy \
apt-utils \ apt-utils \
lsb-core \ lsb-core \
python2.7 \ python2.7 \
<<<<<<< HEAD
=======
python-dev \ python-dev \
&& ln -sf /usr/bin/python2.7 /usr/bin/python \ && ln -sf /usr/bin/python2.7 /usr/bin/python \
>>>>>>> 4207760... Fix for ln: python : file exists
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
# build empire from source # build empire from source