vault backup: 2024-08-14 16:28:38

.obsidian/workspace.json

@@ -47,7 +47,7 @@
             "state": {
               "type": "search",
               "state": {
-                "query": "clipper",
+                "query": "<<<<<<< HEAD",
                 "matchingCase": false,
                 "explainSearch": false,
                 "collapseAll": false,
@@ -64,7 +64,8 @@
               "state": {}
             }
           }
-        ]
+        ],
+        "currentTab": 1
       }
     ],
     "direction": "horizontal",
@@ -137,7 +138,7 @@
       }
     ],
     "direction": "horizontal",
-    "width": 807.5
+    "width": 597.5
   },
   "left-ribbon": {
     "hiddenItems": {
@@ -150,7 +151,7 @@
       "obsidian-importer:Open Importer": false
     }
   },
-  "active": "e97c6f1864abb7d2",
+  "active": "0b4eb06bc73c59e6",
   "lastOpenFiles": [
     "conflict-files-obsidian-git.md",
     "Work/Daily Log/2024-08-14 (Wednesday).md",