From 0ec8e1f3d4120352c19fe5ca5f27bab1a53fca6c Mon Sep 17 00:00:00 2001
From: Ategon <benjamin@barbeau.net>
Date: Sat, 7 Sep 2024 01:43:48 -0400
Subject: [PATCH] vault backup: 2024-09-07 01:43:47

---
 Edikoyo/.obsidian/workspace.json       | 21 +++++++++++++--------
 Edikoyo/Countries/Drenvale.md          |  2 +-
 content/Countries/Drenvale.md          |  2 +-
 content/conflict-files-obsidian-git.md | 22 ----------------------
 4 files changed, 15 insertions(+), 32 deletions(-)
 delete mode 100644 content/conflict-files-obsidian-git.md

diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json
index 359c863..ae90611 100644
--- a/Edikoyo/.obsidian/workspace.json
+++ b/Edikoyo/.obsidian/workspace.json
@@ -95,10 +95,11 @@
             "id": "6dd42c89cd0a32cf",
             "type": "leaf",
             "state": {
-              "type": "diff-view",
+              "type": "markdown",
               "state": {
-                "file": "Edikoyo/.obsidian/workspace.json",
-                "staged": false
+                "file": "Countries/Dratana.md",
+                "mode": "source",
+                "source": false
               }
             }
           }
@@ -169,6 +170,7 @@
             "state": {
               "type": "backlink",
               "state": {
+                "file": "Countries/Dratana.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -185,6 +187,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
+                "file": "Countries/Dratana.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -206,7 +209,9 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-              "state": {}
+              "state": {
+                "file": "Countries/Dratana.md"
+              }
             }
           },
           {
@@ -236,6 +241,10 @@
   },
   "active": "6dd42c89cd0a32cf",
   "lastOpenFiles": [
+    "Countries/Drenvale.md",
+    "Countries/Faelani.md",
+    "Countries/Dratana.md",
+    "Countries/Hanoka.md",
     "conflict-files-obsidian-git.md",
     "Countries/Vosaka.md",
     "Images/slimes/ababa/ababa-3.png",
@@ -259,15 +268,11 @@
     "Countries/Lekia.md",
     "Countries/Lavaki.md",
     "Countries/Krakala.md",
-    "Countries/Hanoka.md",
     "Countries/Gudoko.md",
     "Countries/Gokolm.md",
     "Countries/Felmyr.md",
     "Countries/Falaka.md",
-    "Countries/Faelani.md",
     "Countries/Dolfeyja.md",
-    "Countries/Dratana.md",
-    "Countries/Drenvale.md",
     "Countries/Faelani",
     "Images/Flags/barrowmaw.png",
     "Animals/Slimes",
diff --git a/Edikoyo/Countries/Drenvale.md b/Edikoyo/Countries/Drenvale.md
index bd10ea1..56ceb84 100644
--- a/Edikoyo/Countries/Drenvale.md
+++ b/Edikoyo/Countries/Drenvale.md
@@ -1,6 +1,6 @@
 ---
 short: 
 flag: "![[drenvale.png]]"
-language: 
 capital:
+language: 
 ---
diff --git a/content/Countries/Drenvale.md b/content/Countries/Drenvale.md
index b5f0631..fd3d1f9 100644
--- a/content/Countries/Drenvale.md
+++ b/content/Countries/Drenvale.md
@@ -1,8 +1,8 @@
 ---
 short: null
 flag: '![[drenvale.png]]'
-language: null
 capital: null
+language: null
 ---
 
 
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
-````