From ec0f53a8f6a5b56b032c324d90472203eddbb545 Mon Sep 17 00:00:00 2001 From: Mary Anthony Date: Mon, 27 Apr 2015 11:27:49 -0700 Subject: [PATCH] Pushing fix for mkdocs.yml introduced Signed-off-by: Mary Anthony Conflicts: docs/mkdocs.yml --- docs/mkdocs.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 5ff55909..73eefec4 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -7,3 +7,10 @@ - ['registry/spec/json.md', 'Reference', '    ▪  JSON format' ] - ['registry/spec/auth/token.md', 'Reference', '    ▪  Authenticate via central service' ] +<<<<<<< HEAD +======= +- ['registry/storage-drivers/azure.md', '**HIDDEN**' ] +- ['registry/storage-drivers/filesystem.md', '**HIDDEN**' ] +- ['registry/storage-drivers/inmemory.md', '**HIDDEN**' ] +- ['registry/storage-drivers/s3.md','**HIDDEN**' ] +>>>>>>> d5c0300... Pushing fix for mkdocs.yml introduced