vault backup {{date}}

.obsidian/workspace.json

@@ -4,20 +4,39 @@
     "type": "split",
     "children": [
       {
-        "id": "970bc93cb9e76d14",
+        "id": "a4945c2f40dfd230",
         "type": "tabs",
         "children": [
           {
-            "id": "51283a1bd175637d",
+            "id": "ec35ad1ba6900d85",
             "type": "leaf",
             "state": {
-              "type": "empty",
-              "state": {},
+              "type": "split-diff-view",
+              "state": {
+                "aFile": ".obsidian/workspace.json",
+                "bFile": ".obsidian/workspace.json",
+                "aRef": ""
+              },
+              "icon": "diff",
+              "title": "Diff: workspace.json"
+            }
+          },
+          {
+            "id": "cfc8c132370ad11d",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              },
               "icon": "lucide-file",
-              "title": "Nueva pestaña"
+              "title": "conflict-files-obsidian-git"
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -216,8 +235,9 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "51283a1bd175637d",
+  "active": "cfc8c132370ad11d",
   "lastOpenFiles": [
+    "conflict-files-obsidian-git.md",
     "Servidores/M5/Actividades/RA2/RA2 \"Instal·la programari de propòsit general avaluant-ne lescaracterístiques i els entorns d’aplicació. Instal·lació de programarid’utilitat i propòsit general per a un sistema informàtic\".md",
     "Servidores/M5/Actividades",
     "README.md",