From e8341d867b2ce5752664d0b4be4fef440ad56f21 Mon Sep 17 00:00:00 2001
From: Jasper Ras <jaspert.ras@gmail.com>
Date: Fri, 18 Apr 2025 21:02:17 +0200
Subject: vault backup: 2025-04-18 21:02:17

---
 .obsidian/workspace.json       | 30 ++++++++----------------------
 conflict-files-obsidian-git.md | 17 -----------------
 2 files changed, 8 insertions(+), 39 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index b94e45a..61c850d 100644
--- a/.obsidian/workspace.json
+++ b/.obsidian/workspace.json
@@ -40,30 +40,16 @@
           {
             "id": "be0892c76b1d189a",
             "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "Nix Inherit.md",
-                "mode": "source",
-                "backlinks": true,
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "Nix Inherit"
-            }
-          },
-          {
-            "id": "1fb3c7b7af372a3c",
-            "type": "leaf",
             "state": {
               "type": "split-diff-view",
               "state": {
-                "aFile": "conflict-files-obsidian-git.md",
-                "bFile": "conflict-files-obsidian-git.md",
-                "aRef": ""
+                "aFile": ".obsidian/workspace.json",
+                "bFile": ".obsidian/workspace.json",
+                "aRef": "HEAD",
+                "bRef": ""
               },
               "icon": "diff",
-              "title": "Diff: conflict-files-obsidian-git"
+              "title": "Diff: workspace.json"
             }
           },
           {
@@ -81,7 +67,7 @@
             }
           }
         ],
-        "currentTab": 3
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -232,8 +218,9 @@
       "obsidian-excalidraw-plugin:New drawing": false
     }
   },
-  "active": "1fb3c7b7af372a3c",
+  "active": "be0892c76b1d189a",
   "lastOpenFiles": [
+    "Nix Inherit.md",
     "NixOS - Imperative container management.md",
     "conflict-files-obsidian-git.md",
     "daily/18-Apr-2025.md",
@@ -260,7 +247,6 @@
     "OVN upgrade.md",
     "Network outage on single hypervisor causes Freenet to shutdown EVERYTHING.md",
     "Managing the amount of WSGI processes ran by apache is done from the apache site configuration.md",
-    "Managing Ceph on Devstack & OpenStack.md",
     "ESP",
     "Excalidraw"
   ]
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
-- 
cgit v1.2.3