From 1924c60336e1aad52510eb1fa2ad3b5baaa0eee7 Mon Sep 17 00:00:00 2001
From: xorrior <chris@xorrior.com>
Date: Fri, 4 May 2018 12:19:51 -0400
Subject: [PATCH] Fix conflict

---
 Dockerfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index fe5c7b9..2703697 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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