vault backup: 2024-09-07 01:50:03

Edikoyo/.obsidian/workspace.json

@@ -97,26 +97,14 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Countries/_index.md",
+                "file": "Countries/Mortham.md",
-                "mode": "source",
-                "source": false
-              }
-            }
-          },
-          {
-            "id": "22c283177fda2e48",
-            "type": "leaf",
-            "state": {
-              "type": "markdown",
-              "state": {
-                "file": "conflict-files-obsidian-git.md",
                 "mode": "source",
                 "source": false
               }
             }
           }
         ],
-        "currentTab": 8
+        "currentTab": 7
       }
     ],
     "direction": "vertical"
@@ -182,7 +170,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "conflict-files-obsidian-git.md",
+                "file": "Countries/Mortham.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -199,7 +187,7 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "conflict-files-obsidian-git.md",
+                "file": "Countries/Mortham.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -222,7 +210,7 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "conflict-files-obsidian-git.md"
+                "file": "Countries/Mortham.md"
               }
             }
           },
@@ -251,14 +239,30 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "22c283177fda2e48",
+  "active": "6dd42c89cd0a32cf",
   "lastOpenFiles": [
-    "Countries/_index.md",
+    "Countries/Mantine.md",
-    "conflict-files-obsidian-git.md",
+    "Countries/Llasuki.md",
-    "Countries/Dratana.md",
+    "Countries/Lekia.md",
-    "Countries/Drenvale.md",
+    "Countries/Lavaki.md",
-    "Countries/Faelani.md",
+    "Countries/Krakala.md",
     "Countries/Hanoka.md",
+    "Countries/Gudoko.md",
+    "Countries/Gokolm.md",
+    "Countries/Felmyr.md",
+    "Countries/Falaka.md",
+    "Countries/Faelani.md",
+    "Countries/Drenvale.md",
+    "Countries/Dratana.md",
+    "Countries/Dolfeyja.md",
+    "Countries/Dasona.md",
+    "Countries/Dahallow.md",
+    "Countries/Calcetron.md",
+    "Countries/Blanchister.md",
+    "Countries/Batanoka.md",
+    "Countries/_index.md",
+    "Countries/Barrowmaw.md",
+    "conflict-files-obsidian-git.md",
     "Countries/Vosaka.md",
     "Images/slimes/ababa/ababa-3.png",
     "Images/slimes/ababa/ababa-4.png",
@@ -269,22 +273,6 @@
     "Countries/Vikogyna.md",
     "Countries/Vanatn.md",
     "Countries/Soljord.md",
-    "Countries/Seraphis.md",
-    "Countries/Ovanos.md",
-    "Countries/Oshela.md",
-    "Countries/Nonkur.md",
-    "Countries/Nasahra.md",
-    "Countries/Nakadon.md",
-    "Countries/Mortham.md",
-    "Countries/Mantine.md",
-    "Countries/Llasuki.md",
-    "Countries/Lekia.md",
-    "Countries/Lavaki.md",
-    "Countries/Krakala.md",
-    "Countries/Gudoko.md",
-    "Countries/Gokolm.md",
-    "Countries/Felmyr.md",
-    "Countries/Falaka.md",
     "Countries/Faelani",
     "Images/Flags/barrowmaw.png",
     "Animals/Slimes",

Edikoyo/Countries/Blanchister.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: The Realm of Nomads
 flag: "![[blanchister.png]]"
 language: 
 capital:

Edikoyo/Countries/Calcetron.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: The Electric Republic
 flag: "![[calcetron.png]]"
 language: 
 capital:

Edikoyo/Countries/Dahallow.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: The Blooming Kingdom
 flag: "![[dahallow.png]]"
 language: 
 capital:

Edikoyo/Countries/Dolfeyja.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: The Peaceful Summit
 flag: "![[dolfeyja.png]]"
 language: "[[Edikan]]"
 capital:

Edikoyo/Countries/Dratana.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Realm of Dragons
 flag: "![[dratana.png]]"
 capital: 
 language:

Edikoyo/Countries/Drenvale.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Diesel Kingdom
 flag: "![[drenvale.png]]"
 capital: 
 language:

Edikoyo/Countries/Faelani.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Fairy Forest
 flag: "![[faelani.png]]"
 capital: 
 language:

Edikoyo/Countries/Falaka.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: The Empire of Flames
 flag: "![[falaka.png]]"
 capital: 
 language:

Edikoyo/Countries/Felmyr.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Draconic Temples
 flag: "![[felmyr.png]]"
 capital: 
 language:

Edikoyo/Countries/Gokolm.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Mechanical Wasteland
 flag: "![[gokolm.png]]"
 capital: 
 language:

Edikoyo/Countries/Gudoko.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Unified Miners
 flag: "![[gudoko.png]]"
 capital: 
 language:

Edikoyo/Countries/Hanoka.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Harbringers of Peace
 flag: "![[hanoka.png]]"
 capital: 
 language:

Edikoyo/Countries/Krakala.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: The Merchant Capital
 flag: "![[krakala.png]]"
 capital: 
 language:

Edikoyo/Countries/Lavaki.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Volcanic Ridge
 flag: "![[lavaki.png]]"
 capital: 
 language:

Edikoyo/Countries/Lekia.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Marshy Jungles
 flag: "![[lekia.png]]"
 capital: 
 language:

Edikoyo/Countries/Llasuki.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Realm of the Gods
 flag: "![[llasuki.png]]"
 capital: 
 language:

Edikoyo/Countries/Mantine.md

@@ -1,5 +1,5 @@
 ---
-short: 
+short: Deep Shores
 flag: "![[mantine.png]]"
 capital: 
 language:

content/Countries/Blanchister.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: The Realm of Nomads
 flag: '![[blanchister.png]]'
 language: null
 capital: null

content/Countries/Calcetron.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: The Electric Republic
 flag: '![[calcetron.png]]'
 language: null
 capital: null

content/Countries/Dahallow.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: The Blooming Kingdom
 flag: '![[dahallow.png]]'
 language: null
 capital: null

content/Countries/Dolfeyja.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: The Peaceful Summit
 flag: '![[dolfeyja.png]]'
 language: '[[Edikan]]'
 capital: null

content/Countries/Dratana.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Realm of Dragons
 flag: '![[dratana.png]]'
 capital: null
 language: null

content/Countries/Drenvale.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Diesel Kingdom
 flag: '![[drenvale.png]]'
 capital: null
 language: null

content/Countries/Faelani.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Fairy Forest
 flag: '![[faelani.png]]'
 capital: null
 language: null

content/Countries/Falaka.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: The Empire of Flames
 flag: '![[falaka.png]]'
 capital: null
 language: null

content/Countries/Felmyr.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Draconic Temples
 flag: '![[felmyr.png]]'
 capital: null
 language: null

content/Countries/Gokolm.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Mechanical Wasteland
 flag: '![[gokolm.png]]'
 capital: null
 language: null

content/Countries/Gudoko.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Unified Miners
 flag: '![[gudoko.png]]'
 capital: null
 language: null

content/Countries/Hanoka.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Harbringers of Peace
 flag: '![[hanoka.png]]'
 capital: null
 language: null

content/Countries/Krakala.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: The Merchant Capital
 flag: '![[krakala.png]]'
 capital: null
 language: null

content/Countries/Lavaki.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Volcanic Ridge
 flag: '![[lavaki.png]]'
 capital: null
 language: null

content/Countries/Lekia.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Marshy Jungles
 flag: '![[lekia.png]]'
 capital: null
 language: null

content/Countries/Llasuki.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Realm of the Gods
 flag: '![[llasuki.png]]'
 capital: null
 language: null

content/Countries/Mantine.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Deep Shores
 flag: '![[mantine.png]]'
 capital: null
 language: null

content/Countries/Mortham.md

@@ -1,5 +1,5 @@
 ---
-short: null
+short: Pirate Bay
 flag: '![[mortham.png]]'
 capital: null
 language: null

content/conflict-files-obsidian-git.md

@@ -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
-````