Merge remote-tracking branch 'origin/master'

.obsidian/workspace.json

@@ -15,16 +15,31 @@
               "state": {
                 "file": "PERSONAL PROJECTS/P2EP/cdRead.canvas",
                 "viewState": {
-                  "x": -152.69689369723022,
-                  "y": -1853.884774735966,
-                  "zoom": -0.9999999999999999
+                  "x": 231.4958542407797,
+                  "y": -1530.691321254797,
+                  "zoom": -0.33333333333333326
                 }
               },
               "icon": "lucide-layout-dashboard",
               "title": "cdRead"
             }
+          },
+          {
+            "id": "ec2029f57dac8b2d",
+            "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
       }
     ],
     "direction": "vertical"
@@ -143,24 +158,17 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "WORK & PROJECTS/Ulab/Доступы к точкам.md"
+                "file": "conflict-files-obsidian-git.md",
+                "followCursor": false,
+                "showSearch": false,
+                "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "Структура Доступы к точкам"
-            }
-          },
-          {
-            "id": "c463341da3a7d6da",
-            "type": "leaf",
-            "state": {
-              "type": "git-view",
-              "state": {},
-              "icon": "git-pull-request",
-              "title": "Source Control"
+              "title": "Outline of conflict-files-obsidian-git"
             }
           }
         ],
-        "currentTab": 4
+        "currentTab": 3
       }
     ],
     "direction": "horizontal",
@@ -178,8 +186,11 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "343836aed0394d03",
+  "active": "ec2029f57dac8b2d",
   "lastOpenFiles": [
+    "PERSONAL PROJECTS/P2EP/cdRead.canvas",
+    "conflict-files-obsidian-git.md",
+    "My/Diet 2.md",
     "PERSONAL PROJECTS/P2EP/pseudoCode/MakeSmallChar.md",
     "PERSONAL PROJECTS/P2EP/pseudoCode/FUN_80015674 Update Entity Stats.md",
     "PERSONAL PROJECTS/P2EP/pseudoCode/FUN_800453e0 SystemEventManager.md",
@@ -190,10 +201,8 @@
     "PERSONAL PROJECTS/PS1 DOCS/PSX code - Load texture from SECTOR!.md",
     "PERSONAL PROJECTS/PS1 DOCS/PSX code texture load unpack show and fade.md",
     "PERSONAL PROJECTS/Persona 1/Script Format.md",
-    "My/Diet 2.md",
     "WORK & PROJECTS/Mol/Серверы/git.moldev.ru.md",
     "PERSONAL PROJECTS/PS1 DOCS/CD_Execute_Reading.md",
-    "PERSONAL PROJECTS/P2EP/cdRead.canvas",
     "PERSONAL PROJECTS/PS1 DOCS/PSX code logo show.md",
     "PERSONAL PROJECTS/PS1 DOCS/PSX code Gamepad code.md",
     "WORK & PROJECTS/Mol/Планы и диаграммы/Разработка - ЭПИКИ.md",
@@ -206,8 +215,6 @@
     "PERSONAL PROJECTS/PS1 DOCS/PS1 IRQ.md",
     "PERSONAL PROJECTS/PS1 DOCS/PS1 MDEC.md",
     "PERSONAL PROJECTS/PS1 DOCS/PS1 Gpu-DMA.md",
-    "PERSONAL PROJECTS/PS1 DOCS/PS1 Geometry Transformation Engine.md",
-    "PERSONAL PROJECTS/PS1 DOCS/PS1 Gamepad.md",
     "PERSONAL PROJECTS/PS1 DOCS",
     "PERSONAL PROJECTS/P2EP/pseudoCode",
     "WORK & PROJECTS/Mol/Документы для ТЗ ЛИМС/СМК/КУ_Чек_лист_10_ошибок_УД_скачивание.pdf",