vault backup: 2025-10-07 17:41:39

.obsidian/workspace-mobile.json

@@ -11,6 +11,12 @@
             "id": "b4b3f5e24e1f4059",
             "type": "leaf",
             "state": {
+<<<<<<< HEAD
+              "type": "empty",
+              "state": {},
+              "icon": "lucide-file",
+              "title": "New tab"
+=======
               "type": "markdown",
               "state": {
                 "file": "2025-10-07.md",
@@ -19,6 +25,7 @@
               },
               "icon": "lucide-file",
               "title": "2025-10-07"
+>>>>>>> origin/main
             }
           }
         ]
@@ -98,7 +105,10 @@
         "state": {
           "type": "backlink",
           "state": {
+<<<<<<< HEAD
+=======
             "file": "2025-10-07.md",
+>>>>>>> origin/main
             "collapseAll": false,
             "extraContext": false,
             "sortOrder": "alphabetical",
@@ -117,7 +127,10 @@
         "state": {
           "type": "outgoing-link",
           "state": {
+<<<<<<< HEAD
+=======
             "file": "2025-10-07.md",
+>>>>>>> origin/main
             "linksCollapsed": false,
             "unlinkedCollapsed": true
           },
@@ -131,7 +144,10 @@
         "state": {
           "type": "outline",
           "state": {
+<<<<<<< HEAD
+=======
             "file": "2025-10-07.md",
+>>>>>>> origin/main
             "followCursor": false,
             "showSearch": false,
             "searchQuery": ""
@@ -157,8 +173,12 @@
   },
   "active": "b4b3f5e24e1f4059",
   "lastOpenFiles": [
+<<<<<<< HEAD
+    "2025-10-07.md"
+=======
     "conflict-files-obsidian-git.md",
     "2025-10-07.md",
     "2025-10-06.md"
+>>>>>>> origin/main
   ]
 }

.obsidian/workspace.json

@@ -8,21 +8,21 @@
         "type": "tabs",
         "children": [
           {
-            "id": "f79388908056f299",
+            "id": "f3e91d6a49d2c95c",
             "type": "leaf",
             "state": {
               "type": "markdown",
               "state": {
-                "file": "2025-10-07.md",
+                "file": "2025-10-01.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "2025-10-07"
+              "title": "2025-10-01"
             }
           },
           {
-            "id": "f3e91d6a49d2c95c",
+            "id": "8334f835abeb5ca6",
             "type": "leaf",
             "state": {
               "type": "markdown",
@@ -192,11 +192,12 @@
       "bases:Create new base": false
     }
   },
-  "active": "f3e91d6a49d2c95c",
+  "active": "8334f835abeb5ca6",
   "lastOpenFiles": [
-    "2025-10-06.md",
+    "conflict-files-obsidian-git.md",
     "2025-10-07.md",
     "2025-10-01.md",
+    "2025-10-06.md",
     "2025-09-30.md",
     "2025-09-23.md",
     "2025-09-29.md",

2025-10-01.md

@@ -18,5 +18,4 @@
 - nobody helps me clean the kitchen
 
 # Conclusion
-i will try call them tomorrow
-please help me ..
+

2025-10-06.md

@@ -1,8 +0,0 @@
-2025-10-06
-# Goals
-# Process
-
-# Problems
-
-# Conclusion
-