Mirrors/inspec
2
0
Fork 0
mirror of https://github.com/inspec/inspec synced 2024-12-11 22:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes merge conflict messages (#2677)

Browse source 
Signed-off-by: kagarmoe <kgarmoe@chef.io>
This commit is contained in:
Kimberly Garmoe 2018-02-16 16:39:41 -08:00 committed by Jared Quick
parent f641fdcff3
commit d76ae9eae7
3 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
docs/resources/aide_conf.md.erb
View file

@ -73,10 +73,4 @@ The following examples show how to use this InSpec audit resource.
## Matchers ## Matchers
<<<<<<< HEAD
For a full list of available matchers please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
=======
For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/). For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
>>>>>>> Add one comma in all docs & deletes two repeated sentences.

6
docs/resources/azure_generic_resource.md.erb
View file

@ -232,10 +232,4 @@ Please see the integration tests for in depth examples of how this resource can
## Matchers ## Matchers
<<<<<<< HEAD
For a full list of available matchers please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
=======
For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/). For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
>>>>>>> Add one comma in all docs & deletes two repeated sentences.

6
docs/resources/inetd_conf.md.erb
View file

@ -90,11 +90,5 @@ then the same test will return `false` for `ftp` and the entire test will fail.
## Matchers ## Matchers
<<<<<<< HEAD
For a full list of available matchers please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
=======
For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/). For a full list of available matchers, please visit our [matchers page](https://www.inspec.io/docs/reference/matchers/).
>>>>>>> Add one comma in all docs & deletes two repeated sentences.