cleanup merge confict comment

This commit is contained in:
Alexei Ledenev 2016-05-18 10:56:46 +03:00
parent e074995a2c
commit 3775700d05

View file

@ -55,7 +55,7 @@ Command line switches are optional. The following switches are recognized.
Example: run_tests.sh -t -o /var/docker-bench/results 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 ### 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 \ -v /etc:/etc --label docker_bench_security \
docker-bench-tests docker-bench-tests
``` ```
<<<<<<< HEAD
>>>>>>> update README.md file with info about running Bats tests
=======
>>>>>>> a888600cbb2c08e85ce279b335345e136d529f9b
## Building Docker Bench for Security ## Building Docker Bench for Security