admin/SergObsidian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
sShemet
2026-03-27 19:13:45 +05:00
parent 13ba39bce3 1df6aad2a8
commit 37f7158edf
11 changed files with 1536 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
.obsidian/workspace.json vendored
View File

@@ -34,9 +34,23 @@
"icon": "lucide-file",
"title": "Без названия"
}
},
{
"id": "8df5cf52af8eb341",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "conflict-files-obsidian-git"
}
}
],
"currentTab": 1
"currentTab": 2
}
],
"direction": "vertical"
@@ -155,13 +169,13 @@
"state": {
"type": "outline",
"state": {
"file": "Без названия.md",
"file": "conflict-files-obsidian-git.md",
"followCursor": false,
"showSearch": false,
"searchQuery": ""
},
"icon": "lucide-list",
"title": "Структура Без названия"
"title": "Структура conflict-files-obsidian-git"
}
}
],
@@ -185,24 +199,27 @@
"obsidian-git:Open Git source control": false
}
},
"active": "5c58359e6dbf08fd",
"active": "8df5cf52af8eb341",
"lastOpenFiles": [
"WORK & PROJECTS/Mol/Планы и диаграммы/План СИЛА.md",
"Без названия.md",
"conflict-files-obsidian-git.md",
"PERSONAL PROJECTS/Akaki Mon/Ideas/VN Concept.md",
"PERSONAL PROJECTS/Akaki Mon/Ideas/Akaki Mon (FINAL).md",
"PERSONAL PROJECTS/Akaki Mon/Ideas",
"PERSONAL PROJECTS/Akaki Mon/BGM/Sennen no Tabiji (Final Vocal Edit).mp3",
"PERSONAL PROJECTS/Akaki Mon/BGM/Marika's Theme (Serene Take 4).mp3",
"PERSONAL PROJECTS/Akaki Mon/BGM/Kawaimi's Theme (Mystic Forest) v2.mp3",
"PERSONAL PROJECTS/Akaki Mon/BGM/Fleeting Emotions (Vocal Version).mp3",
"PERSONAL PROJECTS/Akaki Mon/BGM/Fleeting Emotions (Opening - No Drums).mp3",
"PERSONAL PROJECTS/Akaki Mon/BGM/Anne's Theme (High Velocity v2 - Melodic Variation).mp3",
"PERSONAL PROJECTS/Akaki Mon/BGM/A New Day Begins (Lonely Piano Version).mp3",
"PERSONAL PROJECTS/Akaki Mon/BGM",
"PERSONAL PROJECTS/Akaki Mon",
"WORK & PROJECTS/Mol/Планы и диаграммы/План СИЛА.md",
"WORK & PROJECTS/UAS/MAIL TRANSFER.md",
"PERSONAL PROJECTS/VPS.md",
"PERSONAL PROJECTS/STREAMS/TEXT TEMPLATE.md",
"PERSONAL PROJECTS/STREAMS/P2EP GOLD ZODIAC AOBA TV.md",
"PERSONAL PROJECTS/STREAMS",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/Шаблон договора 2024-2025.doc",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/Оборудование.xlsx",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/ОА ЛИМС.xlsx",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/для ЛИМС.7z",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/_Сотрудники.xlsx",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/_Помещения.xlsx",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/f92754ca-70d3-4753-ae10-3a29e541da4f.pdf",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/Act.xlsx",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/GRB/Account.xlsx",
"WORK & PROJECTS/Mol/Планы и диаграммы/Согласования и статусы/entities flow.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Согласования и статусы/Структура статусов.canvas",
"WORK & PROJECTS/Mol/Планы и диаграммы/Система тарификации/Расчёт тарифов и списаний.canvas",
@@ -231,9 +248,6 @@
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/samplings table.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/pgo_to_groups.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/modules_to_dyn_controls.md",
"WORK & PROJECTS/Mol/Планы и диаграммы/Заказы/dynamic_controls_table.md",
"Untitled.md",
"WORK & PROJECTS/Mol/Серверы/1С Бухгалтерия.md",
"Структура объектов испытаний.png",
"Схема связей юрлиц и адресов.png",
"WORK & PROJECTS/img/Pasted image 20241212175419.png",