Vault backup

.obsidian/workspace.json

@@ -20,8 +20,23 @@
               "icon": "lucide-file",
               "title": "Mecánica Unix - Manejo de la shell"
             }
+          },
+          {
+            "id": "719c9488ef135132",
+            "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"
@@ -185,7 +200,7 @@
             }
           }
         ],
-        "currentTab": 4
+        "currentTab": 6
       },
       {
         "id": "7ac2f57f0d4937ed",
@@ -219,8 +234,9 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "e615f9321ff830be",
+  "active": "719c9488ef135132",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
     "Documentación personal/Mecanica de Unix/Mecánica Unix - Manejo de la shell.md",
     "BDD/SQL/SQL.md",
     "Programación/PHP/PHP/M9-PHP.md",