From 2a80b4d08e040dfb40ea0dd2c4328ab645c7eab6 Mon Sep 17 00:00:00 2001
From: Ben Ramey <benramey@fastmail.com>
Date: Wed, 14 Aug 2024 16:28:38 -0500
Subject: [PATCH] vault backup: 2024-08-14 16:28:38

---
 .obsidian/workspace.json       |  9 +++++----
 conflict-files-obsidian-git.md | 18 ------------------
 2 files changed, 5 insertions(+), 22 deletions(-)
 delete mode 100644 conflict-files-obsidian-git.md

diff --git a/.obsidian/workspace.json b/.obsidian/workspace.json
index 205ab10..0d24cf9 100644
--- a/.obsidian/workspace.json
+++ b/.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",
diff --git a/conflict-files-obsidian-git.md b/conflict-files-obsidian-git.md
deleted file mode 100644
index d21739b..0000000
--- a/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
-
-- Not a file: .obsidian/workspace.json
-- Not a file: 2024-08-14 (Wednesday).md
-
-# 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
-```
\ No newline at end of file