vault backup: 2025-12-10 09:05:19

.obsidian/workspace.json

@@ -13,30 +13,15 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Journal/2025-12-10.md",
+                "file": "start.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "2025-12-10"
-            }
-          },
-          {
-            "id": "71c2d65668797cf1",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "conflict-files-obsidian-git.md",
-                "mode": "source",
-                "source": false
-              },
-              "icon": "lucide-file",
-              "title": "conflict-files-obsidian-git"
+              "title": "start"
             }
           }
-        ],
-        "currentTab": 1
+        ]
       }
     ],
     "direction": "vertical"
@@ -196,7 +181,7 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "71c2d65668797cf1",
+  "active": "76c07336268f071f",
   "lastOpenFiles": [
     "Journal/2025-12-10.md",
     "conflict-files-obsidian-git.md",

conflict-files-obsidian-git.md

@@ -1,18 +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
-
-- [[2025-12-09]]
-- [[start]]
-
-# 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
-```

start.md

@@ -8,8 +8,6 @@ language: German
 summary: Place where I can simply paste stuff
 ---
 
-<<<<<<< HEAD:start.md
-=======
 vitamin d3 k2 
 kreatin
 eiweis
@@ -35,7 +33,6 @@ sport nach der arbeit damit der tag voll ist
 will irgendwann docto sleep mit ihr schauen
 
 - scp server for this vault
->>>>>>> origin/main:temporary.md
 
 2025 Achievements
 - find good hobby outside gaming: 3d printing and coloring