sdgndfiog

.obsidian/workspace-mobile.json

@@ -167,12 +167,12 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Menstruation.md",
+                "file": "6 - Journal/2025-12-09.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Menstruation"
+              "title": "2025-12-09"
             }
           }
         ],
@@ -317,15 +317,21 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "9dfc13b90671e83f",
+  "active": "d47b13999625374c",
   "lastOpenFiles": [
+    "temporary.md",
+    "6 - Journal/2025-12-09.md",
+    "/6 - Journal/2025-12-08.md",
+    "6 - Journal/2025-12-08.md",
+    "/6 - Journal",
+    "/5 - People/Dominik Kröll.md",
+    "/5 - People",
+    "Menstruation.md",
     "6 - Journal/2025-12-07.md",
     "/6 - Journal/2025-12-07.md",
-    "/6 - Journal",
     "/3 - Resources/Obsidian vault.md",
     "/3 - Resources",
     "Bett.md",
-    "temporary.md",
     "5 - People/Dominik Kröll.md",
     "9 - Canvas/Waschmaschine Guide.canvas",
     "/temporary.md",
@@ -338,7 +344,6 @@
     "/9 - Canvas",
     "/5 - People/Jessica B.md",
     "5 - People/Jessica B.md",
-    "/5 - People",
     "3 - Resources/Movies and Series.md",
     "3 - Resources/Hair removal.md",
     "3 - Resources/Fliegen.md",
@@ -347,11 +352,6 @@
     "/3 - Resources/Movies and Series.md",
     "/3 - Resources/Hair removal.md",
     "/3 - Resources/Fliegen.md",
-    "/3 - Resources/Custom trading cards.md",
-    "/3 - Resources/Books.md",
-    "3 - Resources/Books.md",
-    "/2 - Areas/Computer Science Education.md",
-    "2 - Areas/Computer Science Education.md",
     "/2 - Areas",
     "Pasted image 20250917125121.png",
     "Pasted image 20250917124830.png",

.obsidian/workspace.json

@@ -13,15 +13,30 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "start.md",
+                "file": "Journal/2025-12-10.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "start"
+              "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"
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -181,10 +196,12 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "76c07336268f071f",
+  "active": "71c2d65668797cf1",
   "lastOpenFiles": [
-    "Biology/Sport.md",
+    "Journal/2025-12-10.md",
+    "conflict-files-obsidian-git.md",
     "start.md",
+    "Biology/Sport.md",
     "Biology/Supplements.md",
     "People/Insa Sangs.md",
     "Default/Movies and Series.md",
@@ -207,8 +224,6 @@
     "Default/Books.md",
     "Biology/Bondage.md",
     "Templates/3d printing.md",
-    "3d_Printing/Airbrush.md",
-    "CS/AI Art.md",
     "CS",
     "Task",
     "Archive",

Journal/2025-12-09.md

@@ -1,9 +1,18 @@
 ---
+<<<<<<< HEAD:Journal/2025-12-09.md
 aliases: []
 areas: []
 created: "2025-12-09"
 language: German
 summary: ""
+=======
+aliases: 
+language: English
+created: "2025-12-09"
+summary: 
+tags:
+  - journal
+>>>>>>> origin/main:6 - Journal/2025-12-09.md
 ---
 
 

conflict-files-obsidian-git.md

@@ -0,0 +1,18 @@
+# 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,6 +8,34 @@ language: German
 summary: Place where I can simply paste stuff
 ---
 
+<<<<<<< HEAD:start.md
+=======
+vitamin d3 k2 
+kreatin
+eiweis
+magnesium
+
+320Cal, 74Odo, 54:22, 21,38km
+
+sport nach der arbeit damit der tag voll ist
+
+- rechnung für pycon 10.14
+- ing
+- linkedin
+- git einrichten auf server
+- hygiene routine
+- radeln + mimir
+- restructure vault
+- retro!
+- 
+- crypto
+- trainingsplan
+- arbeit
+
+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