resolve merge

This commit is contained in:
Alexei Ledenev 2016-05-17 14:12:22 +03:00
commit dd9b62f5d0

View file

@ -78,7 +78,10 @@ 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