From 299349d846cc1e6f2db067375eb83c0ca92fe806 Mon Sep 17 00:00:00 2001 From: Valentin Mihov Date: Wed, 6 May 2020 22:24:16 +0300 Subject: [PATCH] Fix a leftover from a merge conflict in the docs Seems like there was an unresolved merge conflict, which was left in the docs. --- content/os/v1.x/en/storage/additional-mounts/_index.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/os/v1.x/en/storage/additional-mounts/_index.md b/content/os/v1.x/en/storage/additional-mounts/_index.md index a9b39af7f33..cdbd75fa638 100644 --- a/content/os/v1.x/en/storage/additional-mounts/_index.md +++ b/content/os/v1.x/en/storage/additional-mounts/_index.md @@ -5,11 +5,7 @@ aliases: - /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]({{}}/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`. ->>>>>>> Reorganize RancherOS docs:content/os/v1.x/en/storage/additional-mounts/_index.md ```yaml #cloud-config