Fix a merge conflict in openstack.yml example
Fix a merge conflict in openstack.yml example

Signed-off-by: Neil Gerring <7d65c4e24b8e3736acf9a6614b49d59749defef2@neilgerring.co.uk>

deitch/linuxkit,djs55/linuxkit,linuxkit/linuxkit,linuxkit/linuxkit,linuxkit/linuxkit,JohnnyLeone/linuxkit,JohnnyLeone/linuxkit,linuxkit/linuxkit,JohnnyLeone/linuxkit,furious-luke/linuxkit,furious-luke/linuxkit,furious-luke/linuxkit,furious-luke/linuxkit,deitch/linuxkit,djs55/linuxkit,djs55/linuxkit,deitch/linuxkit,JohnnyLeone/linuxkit,JohnnyLeone/linuxkit,djs55/linuxkit,deitch/linuxkit,furious-luke/linuxkit,deitch/linuxkit,djs55/linuxkit,linuxkit/linuxkit