Pushing fix for mkdocs.yml introduced

Signed-off-by: Mary Anthony <mary@docker.com>

Conflicts:
	docs/mkdocs.yml
This commit is contained in:
Mary Anthony 2015-04-27 11:27:49 -07:00 committed by Stephen J Day
parent 06405082cb
commit ec0f53a8f6

View file

@ -7,3 +7,10 @@
- ['registry/spec/json.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; JSON format' ]
- ['registry/spec/auth/token.md', 'Reference', '&nbsp;&nbsp;&nbsp;&nbsp;&blacksquare;&nbsp; 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