From 0504f9c4cc3c41d39455d53968ec72d2b6652f6e Mon Sep 17 00:00:00 2001
From: Andrey Arapov <andrey.arapov@nixaid.com>
Date: Sun, 7 May 2017 10:07:28 +0200
Subject: [PATCH] fix readme

---
 README.md | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/README.md b/README.md
index 010d54c29..c8785bec5 100644
--- a/README.md
+++ b/README.md
@@ -119,12 +119,8 @@ if [ ! -d "$DATA_DIRECTORY" ]; then
     chmod -R 777 "$REPORT_DIRECTORY"
 fi
 
-<<<<<<< HEAD
-docker pull owasp/dependency-check 
-=======
 # Make sure we are using the latest version
 docker pull owasp/dependency-check
->>>>>>> 04b506662f96d23d66b858d3d4b9ea29caa4ccb8
 
 docker run --rm \
     --volume $(pwd):/src \