public/rancher-docs
1
0
Fork 0
mirror of https://github.com/rancher/rancher-docs.git synced 2026-09-26 21:18:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2497 from valo/patch-1

Browse Source 
Fix a leftover from a merge conflict in the docs
This commit is contained in:
Catherine Luse
2020-05-06 12:32:49 -07:00
committed by GitHub
parent daff9997ae bf9867e747
commit cbdff7ca2b
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
content/os/v1.x/en/storage/additional-mounts/_index.md
-4
View File
@@ -5,11 +5,7 @@ aliases:
- /os/v1.x/en/installation/storage/additional-mounts - /os/v1.x/en/installation/storage/additional-mounts
--- ---
<<<<<<< HEAD:content/os/v1.x/en/installation/storage/additional-mounts/_index.md
Additional mounts can be specified as part of your [cloud-config]({{<baseurl>}}/os/v1.x/en/installation/configuration/#cloud-config). These mounts are applied within the console container. Here's a simple example that mounts `/dev/vdb` to `/mnt/s`.
=======
Additional mounts can be specified as part of your [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config). These mounts are applied within the console container. Here's a simple example that mounts `/dev/vdb` to `/mnt/s`. Additional mounts can be specified as part of your [cloud-config]({{< baseurl >}}/os/v1.x/en/configuration/#cloud-config). These mounts are applied within the console container. Here's a simple example that mounts `/dev/vdb` to `/mnt/s`.
>>>>>>> Reorganize RancherOS docs:content/os/v1.x/en/storage/additional-mounts/_index.md
```yaml ```yaml
#cloud-config #cloud-config