Merge remote-tracking branch 'origin/master'

.obsidian/workspace.json

@@ -23,8 +23,23 @@
               "icon": "lucide-layout-dashboard",
               "title": "cdRead"
             }
+          },
+          {
+            "id": "1b58776f6ecc641b",
+            "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"
@@ -179,11 +194,11 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "5afb910d292b0d7d",
+  "active": "1b58776f6ecc641b",
   "lastOpenFiles": [
+    "PERSONAL PROJECTS/P2EP/cdRead.canvas",
     "conflict-files-obsidian-git.md",
     "P2EP/cdRead.canvas",
-    "PERSONAL PROJECTS/P2EP/cdRead.canvas",
     "PERSONAL PROJECTS/P2EP",
     "PERSONAL PROJECTS",
     "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md",
@@ -223,7 +238,6 @@
     "WORK & PROJECTS/Ulab/Доступы к точкам.md",
     "WORK & PROJECTS/Mol/Планы и диаграммы/ОБЩАЯ СХЕМА.md",
     "WORK & PROJECTS/Mol/Без названия.md",
-    "WORK & PROJECTS/Ulab/testcode.md",
     "Без названия 2.canvas",
     "Без названия.canvas",
     "Без названия 1.canvas"