[docs] Add labels list for BlockDevice (#121)

Signed-off-by: v.oleynikov <vasily.oleynikov@flant.com>
deckhouse · Feb 13, 2025 · ef104f4 · ef104f4
1 parent 22210fe
commit ef104f4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,6 +30,7 @@
 venv/
 *.code-workspace
 .vscode
+*.code-workspace
 
 # macOS Finder files
 *.DS_Store

diff --git a/docs/FAQ.ru.md b/docs/FAQ.ru.md
@@ -169,4 +169,8 @@ spec:
 
 * status.blockdevice.storage.deckhouse.io/hotplug - возможность hot подключения
 
+<<<<<<< HEAD:docs/FAQ.ru.md
 * status.blockdevice.storage.deckhouse.io/machineid - ID сервера, на котором установлено блочное устройство
+=======
+* status.blockdevice.storage.deckhouse.io/machineid - ID сервера, на котором установлено блочное устройство
+>>>>>>> 519f8d2 ([docs] Add labels list for BlockDevice (#121)):docs/FAQ_RU.md