Merge remote-tracking branch 'origin/master'

.obsidian/workspace.json

@@ -4,24 +4,21 @@
     "type": "split",
     "children": [
       {
-        "id": "6af5a6d9d594eddb",
+        "id": "b1afd552ee0aa86f",
         "type": "tabs",
         "children": [
           {
-            "id": "8378a0bf909bafbc",
+            "id": "5afb910d292b0d7d",
             "type": "leaf",
             "state": {
-              "type": "canvas",
+              "type": "markdown",
               "state": {
-                "file": "P2EP/cdRead.canvas",
-                "viewState": {
-                  "x": 606.6612480877737,
-                  "y": 272.9525231873553,
-                  "zoom": -0.9999999999999999
-                }
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
               },
-              "icon": "lucide-layout-dashboard",
-              "title": "cdRead"
+              "icon": "lucide-file",
+              "title": "conflict-files-obsidian-git"
             }
           }
         ]
@@ -179,9 +176,13 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "8378a0bf909bafbc",
+  "active": "5afb910d292b0d7d",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
     "P2EP/cdRead.canvas",
+    "PERSONAL PROJECTS/P2EP/cdRead.canvas",
+    "PERSONAL PROJECTS/P2EP",
+    "PERSONAL PROJECTS",
     "WORK & PROJECTS/Mol/Ideas/Все идеи для Моли.md",
     "P2EP",
     "WORK & PROJECTS/Mol/Серверы/access.md",
@@ -201,8 +202,6 @@
     "WORK & PROJECTS/Mol/Серверы/DOCS/Load Balancer 2.md",
     "SKILLS DOCS/kubernetes.pdf.crdownload",
     "SKILLS DOCS/devops.pdf.crdownload",
-    "SKILLS DOCS/backend.pdf.crdownload",
-    "SKILLS DOCS",
     "WORK & PROJECTS/Mol/Серверы/DOCS/Load Balancer.md",
     "WORK & PROJECTS/img/Pasted image 20241212175929.png",
     "WORK & PROJECTS/img/Pasted image 20241212175851.png",