From 15df901b777ed6e4ddee1b49f3e1afe1722bb319 Mon Sep 17 00:00:00 2001
From: Ategon <benjamin@barbeau.net>
Date: Sat, 7 Sep 2024 00:55:02 -0400
Subject: [PATCH] vault backup: 2024-09-07 00:55:01

---
 Edikoyo/.obsidian/workspace.json       | 37 +++++++++++++++++++-------
 Edikoyo/test.md                        |  2 ++
 content/conflict-files-obsidian-git.md | 22 ---------------
 content/test.md                        |  6 +++++
 4 files changed, 35 insertions(+), 32 deletions(-)
 create mode 100644 Edikoyo/test.md
 delete mode 100644 content/conflict-files-obsidian-git.md
 create mode 100644 content/test.md

diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json
index d2cf598..b988df3 100644
--- a/Edikoyo/.obsidian/workspace.json
+++ b/Edikoyo/.obsidian/workspace.json
@@ -71,15 +71,28 @@
             "id": "e18161b255f8c3cb",
             "type": "leaf",
             "state": {
-              "type": "diff-view",
+              "type": "markdown",
               "state": {
-                "file": "Edikoyo/.obsidian/workspace.json",
-                "staged": false
+                "file": "Animals/Slimes/_index.md",
+                "mode": "source",
+                "source": false
+              }
+            }
+          },
+          {
+            "id": "6e65a1802f52d161",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "test.md",
+                "mode": "source",
+                "source": false
               }
             }
           }
         ],
-        "currentTab": 5
+        "currentTab": 6
       }
     ],
     "direction": "vertical"
@@ -145,6 +158,7 @@
             "state": {
               "type": "backlink",
               "state": {
+                "file": "test.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -161,6 +175,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
+                "file": "test.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -182,7 +197,9 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-              "state": {}
+              "state": {
+                "file": "test.md"
+              }
             }
           },
           {
@@ -210,12 +227,13 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "e18161b255f8c3cb",
+  "active": "6e65a1802f52d161",
   "lastOpenFiles": [
-    "conflict-files-obsidian-git.md",
-    "Animals/Slimes/Ababa Slime.md",
-    "Animals/_index.md",
     "Animals/Slimes/_index.md",
+    "test.md",
+    "Animals/Slimes/Ababa Slime.md",
+    "conflict-files-obsidian-git.md",
+    "Animals/_index.md",
     "Test One.md",
     "Animals/Slimes/Test.md",
     "Animals/Cat.md",
@@ -238,7 +256,6 @@
     "Countries/Dolfeyja.md",
     "Countries/Dratana.md",
     "Countries/Dahallow.md",
-    "Countries/Calcetron.md",
     "Languages",
     "Images/Flags/vosaka.png",
     "Images/Flags/vikogyna.png",
diff --git a/Edikoyo/test.md b/Edikoyo/test.md
new file mode 100644
index 0000000..b1d95b2
--- /dev/null
+++ b/Edikoyo/test.md
@@ -0,0 +1,2 @@
+```dataview
+```
\ No newline at end of file
diff --git a/content/conflict-files-obsidian-git.md b/content/conflict-files-obsidian-git.md
deleted file mode 100644
index f44af68..0000000
--- a/content/conflict-files-obsidian-git.md
+++ /dev/null
@@ -1,22 +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](conflict-files-obsidian-git.md#additional-instructions) available below file list
-
-* Not a file: Edikoyo/.obsidian/workspace.json
-
-# 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
-````
diff --git a/content/test.md b/content/test.md
new file mode 100644
index 0000000..71f437e
--- /dev/null
+++ b/content/test.md
@@ -0,0 +1,6 @@
+---
+---
+
+
+````dataview
+````