clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 15:28:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing two bad files that got borked in the last rebase

Browse Source 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
This commit is contained in:
Mary Anthony
2015-03-06 14:21:17 -08:00
parent 8c575f263d
commit efde5ec9be
2 changed files with 3 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/mkdocs.yml
+1 -14
View File
@@ -169,23 +169,10 @@ pages:
- ['terms/filesystem.md', '**HIDDEN**']
- ['terms/image.md', '**HIDDEN**']
<<<<<<< HEAD
<<<<<<< HEAD
# Project:
- ['project/index.md', '**HIDDEN**']
- ['project/who-written-for.md', 'Project', 'README first']
=======
# Contribute:
- ['project/index.md', '**HIDDEN**']
- ['project/project.md', 'Contribute', 'Contributing']
# Birthday Tree
- ['project/who-written-for.md', 'Project', 'README for contributors']
>>>>>>> a252b2f... Renaming and removing old files
=======
# Project:
- ['project/index.md', '**HIDDEN**']
- ['project/who-written-for.md', 'Project', 'README first']
>>>>>>> 6f40419... Tweaking from last run thru
- ['project/set-up-prereqs.md', 'Project', 'Set up prerequisites']
- ['project/set-up-dev-env.md', 'Project', 'Work with a development container']
- ['project/test-and-docs.md', 'Project', 'Run tests and test documentation']