From 122462f3ebb8927835202b62820d1826d0da97a7 Mon Sep 17 00:00:00 2001
From: Lil-Carpi <duartesebas007@gmail.com>
Date: Wed, 10 Dec 2025 23:37:50 +0100
Subject: [PATCH] vault backup: 2025-12-10 23:37:50

---
 .obsidian/workspace.json       | 33 +++++++--------------------------
 conflict-files-obsidian-git.md | 17 -----------------
 2 files changed, 7 insertions(+), 43 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index db63092..a0dfb12 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -4,39 +4,20 @@
     "type": "split",
     "children": [
       {
-        "id": "a4945c2f40dfd230",
+        "id": "b58fb90f35f0b269",
         "type": "tabs",
         "children": [
           {
-            "id": "ec35ad1ba6900d85",
+            "id": "5bb933ee810d2703",
             "type": "leaf",
             "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
-              },
+              "type": "empty",
+              "state": {},
               "icon": "lucide-file",
-              "title": "conflict-files-obsidian-git"
+              "title": "Nueva pestaña"
             }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "vertical"
@@ -235,7 +216,7 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "cfc8c132370ad11d",
+  "active": "5bb933ee810d2703",
   "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",
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
deleted file mode 100644
index d8bbd4f..0000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Conflicts
-Please resolve them and commit them using the commands `Git: Commit all changes` followed by `Git: Push`
-(This file will automatically be deleted before commit)
-[[#Additional Instructions]] available below file list
-
-- Not a file: .obsidian/workspace.json
-
-# Additional Instructions
-I strongly recommend to use "Source mode" for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.
-
-```diff
-<<<<<<< HEAD
-    File changes in local repository
-=======
-    File changes in remote repository
->>>>>>> origin/main
-```
\ No newline at end of file