Fix conflict

2018-05-04 12:19:51 -04:00 · 2018-05-04 12:19:51 -04:00 · 1924c60336
parent b90899627b
commit 1924c60336
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@ -45,11 +45,8 @@ RUN apt-get update && apt-get install -qy \
    apt-utils \
    lsb-core \
    python2.7 \
-<<<<<<< HEAD
-=======
    python-dev \ 
  && ln -sf /usr/bin/python2.7 /usr/bin/python \
->>>>>>> 4207760... Fix for ln: python : file exists
  && rm -rf /var/lib/apt/lists/*

 # build empire from source