vault backup: 2024-08-14 16:29:12

.obsidian/workspace.json

@@ -17,8 +17,20 @@
                 "staged": false
               }
             }
+          },
+          {
+            "id": "63af3b8fcfd93b5e",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "2024-08-14 (Wednesday).md",
+                "staged": true
+              }
+            }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "vertical"
@@ -47,7 +59,7 @@
             "state": {
               "type": "search",
               "state": {
-                "query": "<<<<<<< HEAD",
+                "query": "",
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -151,9 +163,10 @@
       "obsidian-importer:Open Importer": false
     }
   },
-  "active": "0b4eb06bc73c59e6",
+  "active": "63af3b8fcfd93b5e",
   "lastOpenFiles": [
     "conflict-files-obsidian-git.md",
+    "2024-08-14 (Wednesday).md",
     "Work/Daily Log/2024-08-14 (Wednesday).md",
     "Work/Daily Log",
     "Quick Notes/Truck notes.md",