Skip to content

Commit

Permalink
Fixed topic map due to merge conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
jberkus committed Aug 31, 2017
1 parent 3436fe9 commit 15d6b9b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions _topic_map.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Topics:
- Name: Welcome
File: index

---
---
Name: Introduction
Dir: introduction
Topics:
Expand Down Expand Up @@ -71,7 +71,7 @@ Topics:
- Name: Magnum
File: magnum


---
Name: Quick Start
Dir: quick_start
Expand Down Expand Up @@ -146,7 +146,7 @@ Topics:
- Name: Creating Own Distribution
Dir: creating_own_distribution
Topics:
- Name: OSTree Compose
- Name: OSTree Compose
File: ostree_compose
- Name: OSTree Server
File: ostree_server
Expand Down Expand Up @@ -219,7 +219,7 @@ Topics:
File: puppet
- Name: Others
File: others

---
Name: Atomic Tools
Dir: atomic_tools
Expand Down Expand Up @@ -264,7 +264,7 @@ Topics:
Name: References
Dir: references
Topics:
- Name: SELinux and Containers
- Name: SELinux and Containers
File: selinux_containers_troubleshooting
- Name: RPM-OSTree Command Reference
File: rpm_ostree_command_ref
Expand Down

0 comments on commit 15d6b9b

Please sign in to comment.