vault backup: 2024-08-01 18:04:05

.obsidian/workspace.json

@@ -20,7 +20,7 @@
             }
           },
           {
-            "id": "1ba1e069ad24e3d0",
+            "id": "0caab52aafa99b83",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -43,6 +43,18 @@
               }
             }
           },
+          {
+            "id": "d99b794fb30ad2d4",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "conflict-files-obsidian-git.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
           {
             "id": "eab11d225abaf8a7",
             "type": "leaf",
@@ -80,7 +92,7 @@
             }
           }
         ],
-        "currentTab": 1
+        "currentTab": 3
       }
     ],
     "direction": "vertical"
@@ -146,7 +158,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Geschäft/Etiketten/Drucken/01 - Drucken.md",
+                "file": "conflict-files-obsidian-git.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -163,7 +175,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Geschäft/Etiketten/Drucken/01 - Drucken.md",
+                "file": "conflict-files-obsidian-git.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -186,7 +198,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Geschäft/Etiketten/Drucken/01 - Drucken.md"
+                "file": "conflict-files-obsidian-git.md"
               }
             }
           },
@@ -239,16 +251,17 @@
       "obsidian-excalidraw-plugin:Create new drawing": false
     }
   },
-  "active": "1ba1e069ad24e3d0",
+  "active": "d99b794fb30ad2d4",
   "lastOpenFiles": [
     "Geschäft/Etiketten/Drucken/03 - Gedruckt & Geschnitten.md",
+    "conflict-files-obsidian-git.md",
     "Geschäft/Etiketten/Drucken/01 - Drucken.md",
     "ToDo's/ToDo's.md",
+    "HomeLab/Linux Befehle.md",
     "Bank.md",
     "HomeLab/VPS/Screen.md",
     "Geschäft/IT/Postgres.md",
     "Programmieren/Spicy Storage/01 - ToDo's - Verbesserungen.md",
-    "HomeLab/Linux Befehle.md",
     "HomeLab/VPS/Nextcloud.md",
     "HomeLab/VPS/Rust Desk.md",
     "HomeLab/VPS/Headscale.md",
@@ -271,7 +284,6 @@
     "Ausbildung/MJU.md",
     "Ausbildung",
     "HomeLab/Untitled",
-    "HomeLab/Rose/Minecraft Server.md",
     "Geschäft/Gewürze/attachments/2420032101MB - Angebot Districap - Ninon Mix - Lodner Gewürze.pdf",
     "Geschäft/Gewürze/attachments",
     "3D Druck/Projekte/Geschäft/Küche",