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
2025-04-22 15:32:58 +05:00
parent 85201e114f 4051c98d32
commit 44b8d629d8
1 changed files with 10 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
.obsidian/workspace.json vendored
View File

@@ -4,53 +4,24 @@
"type": "split",
"children": [
{
"id": "b1afd552ee0aa86f",
"id": "6f267f61dfa5a7ac",
"type": "tabs",
"children": [
{
"id": "343836aed0394d03",
"id": "9646dde68fa819a1",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "My/Diet 1.md",
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "Diet 1"
}
},
{
"id": "b53a01957dbe5e78",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "My/Diet 2.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "Diet 2"
}
},
{
"id": "dd912cc876184c4f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "PERSONAL PROJECTS/PS1 DOCS/CD_Execute_Reading.md",
"mode": "source",
"source": false
},
"icon": "lucide-file",
"title": "CD_Execute_Reading"
"title": "conflict-files-obsidian-git"
}
}
],
"currentTab": 2
]
}
],
"direction": "vertical"
@@ -204,11 +175,14 @@
"obsidian-git:Open Git source control": false
}
},
"active": "dd912cc876184c4f",
"active": "9646dde68fa819a1",
"lastOpenFiles": [
"conflict-files-obsidian-git.md",
"PERSONAL PROJECTS/P2EP/cdRead.canvas",
"My/Diet 1.md",
"PERSONAL PROJECTS/PS1 DOCS/CD_Execute_Reading.md",
"PERSONAL PROJECTS/P2EP/pseudoCode/fade calculation.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code Gamepad code.md",
"PERSONAL PROJECTS/PS1 DOCS/CD_Execute_Reading.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code logo show.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code - Load texture from SECTOR!.md",
"WORK & PROJECTS/Mol/Code Chunks/TipTap Plugin.md",
@@ -232,9 +206,6 @@
"PERSONAL PROJECTS/PS1 DOCS",
"PERSONAL PROJECTS/PS1 DOCS/PSX code texture load unpack show and fade.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code inline asm.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code - Texture show from file.md",
"PERSONAL PROJECTS/PS1 DOCS/PSX code - modules load and exec.md",
"PERSONAL PROJECTS/PS1 DOCS/PS1 Vblank.md",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СМК/КУ_Чек_лист_10_ошибок_УД_скачивание.pdf",
"WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СМК",
"WORK & PROJECTS/Mol/Планы и диаграммы/00001_Редактор_форм/Таблицы нумератора и документов.canvas",
@@ -251,7 +222,6 @@
"WORK & PROJECTS/Mol/Серверы/Схема инфраструктуры.canvas",
"WORK & PROJECTS/Ulab/Автобан/щебень 5-20.xlsx",
"WORK & PROJECTS/Mol/Серверы/Alfa cloud prod.canvas",
"PERSONAL PROJECTS/P2EP/cdRead.canvas",
"P2EP/cdRead.canvas",
"WORK & PROJECTS/img/Pasted image 20241212175419.png",
"WORK & PROJECTS/img/Pasted image 20241212175847.png",