From 3775700d05378445c16f959e163562e83bd43583 Mon Sep 17 00:00:00 2001 From: Alexei Ledenev Date: Wed, 18 May 2016 10:56:46 +0300 Subject: [PATCH] cleanup merge confict comment --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index 457fbd9..80dbf42 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,7 @@ Command line switches are optional. The following switches are recognized. Example: run_tests.sh -t -o /var/docker-bench/results ``` -You need to run `run_tests.sh` on Docker host as `root` user. +**Note:**: You need to run `run_tests.sh` on Docker host as `root` user. ### Running Docker Bench Bats tests from Docker image @@ -78,10 +78,6 @@ docker run -it --net host --pid host --cap-add audit_control \ -v /etc:/etc --label docker_bench_security \ docker-bench-tests ``` -<<<<<<< HEAD ->>>>>>> update README.md file with info about running Bats tests -======= ->>>>>>> a888600cbb2c08e85ce279b335345e136d529f9b ## Building Docker Bench for Security