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

.obsidian/workspace-mobile.json

@@ -11,10 +11,21 @@
             "id": "b4b3f5e24e1f4059",
             "type": "leaf",
             "state": {
+<<<<<<< HEAD
               "type": "empty",
               "state": {},
               "icon": "lucide-file",
               "title": "New tab"
+=======
+              "type": "markdown",
+              "state": {
+                "file": "2025-10-07.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "2025-10-07"
+>>>>>>> origin/main
             }
           }
         ]
@@ -94,6 +105,10 @@
         "state": {
           "type": "backlink",
           "state": {
+<<<<<<< HEAD
+=======
+            "file": "2025-10-07.md",
+>>>>>>> origin/main
             "collapseAll": false,
             "extraContext": false,
             "sortOrder": "alphabetical",
@@ -112,6 +127,10 @@
         "state": {
           "type": "outgoing-link",
           "state": {
+<<<<<<< HEAD
+=======
+            "file": "2025-10-07.md",
+>>>>>>> origin/main
             "linksCollapsed": false,
             "unlinkedCollapsed": true
           },
@@ -125,6 +144,10 @@
         "state": {
           "type": "outline",
           "state": {
+<<<<<<< HEAD
+=======
+            "file": "2025-10-07.md",
+>>>>>>> origin/main
             "followCursor": false,
             "showSearch": false,
             "searchQuery": ""
@@ -150,6 +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
   ]
 }