Eduardo Arango 9f97da0956 resolve merge conflicts ...

Signed-off-by: Eduardo Arango <eduardo@sylabs.io>

2019-04-16 17:01:22 -05:00

..

index.html.md

list singularity as a community driver

2019-04-12 12:59:31 -05:00

lxc.html.md

add community section under task drivers and sync name with device plugins (#5542)

2019-04-10 16:56:38 -04:00

singularity.html.md

resolve merge conflicts

2019-04-16 17:01:22 -05:00