resolve merge conflicts

Signed-off-by: Eduardo Arango <eduardo@sylabs.io>
This commit is contained in:
Eduardo Arango 2019-04-16 17:01:22 -05:00
commit 40d0af5422
No known key found for this signature in database
GPG key ID: D3F0A3365148A815

View file

@ -146,7 +146,7 @@ The `Singularity` driver requires the following:
* `enabled` - The `Singularity` driver may be disabled on hosts by setting this option to `false` (defaults to `true`).
* `singularity_path` - The location in which all containers are stored (commonly defaults to `/var/lib/singularity`). See [`Singularity-ache`][Singularity-cache] for more details.
* `singularity_path` - The location in which all containers are stored (commonly defaults to `/var/lib/singularity`). See [`Singularity-cache`][Singularity-cache] for more details.
An example of using these plugin options with the new [plugin
syntax][plugin] is shown below: