diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index ef68056..8c25f06 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -97,26 +97,14 @@ "state": { "type": "markdown", "state": { - "file": "Countries/_index.md", - "mode": "source", - "source": false - } - } - }, - { - "id": "22c283177fda2e48", - "type": "leaf", - "state": { - "type": "markdown", - "state": { - "file": "conflict-files-obsidian-git.md", + "file": "Countries/Mortham.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", - "conflict-files-obsidian-git.md", - "Countries/Dratana.md", - "Countries/Drenvale.md", - "Countries/Faelani.md", + "Countries/Mantine.md", + "Countries/Llasuki.md", + "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/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", diff --git a/Edikoyo/Countries/Blanchister.md b/Edikoyo/Countries/Blanchister.md index 11dc40d..59d59c9 100644 --- a/Edikoyo/Countries/Blanchister.md +++ b/Edikoyo/Countries/Blanchister.md @@ -1,5 +1,5 @@ --- -short: +short: The Realm of Nomads flag: "![[blanchister.png]]" language: capital: diff --git a/Edikoyo/Countries/Calcetron.md b/Edikoyo/Countries/Calcetron.md index 8e210bb..6e11d4a 100644 --- a/Edikoyo/Countries/Calcetron.md +++ b/Edikoyo/Countries/Calcetron.md @@ -1,5 +1,5 @@ --- -short: +short: The Electric Republic flag: "![[calcetron.png]]" language: capital: diff --git a/Edikoyo/Countries/Dahallow.md b/Edikoyo/Countries/Dahallow.md index 1f55868..f85f24e 100644 --- a/Edikoyo/Countries/Dahallow.md +++ b/Edikoyo/Countries/Dahallow.md @@ -1,5 +1,5 @@ --- -short: +short: The Blooming Kingdom flag: "![[dahallow.png]]" language: capital: diff --git a/Edikoyo/Countries/Dolfeyja.md b/Edikoyo/Countries/Dolfeyja.md index 0a52ef9..98107c2 100644 --- a/Edikoyo/Countries/Dolfeyja.md +++ b/Edikoyo/Countries/Dolfeyja.md @@ -1,5 +1,5 @@ --- -short: +short: The Peaceful Summit flag: "![[dolfeyja.png]]" language: "[[Edikan]]" capital: diff --git a/Edikoyo/Countries/Dratana.md b/Edikoyo/Countries/Dratana.md index 48b5bdf..3658663 100644 --- a/Edikoyo/Countries/Dratana.md +++ b/Edikoyo/Countries/Dratana.md @@ -1,6 +1,6 @@ --- -short: +short: Realm of Dragons flag: "![[dratana.png]]" -capital: -language: +capital: +language: --- diff --git a/Edikoyo/Countries/Drenvale.md b/Edikoyo/Countries/Drenvale.md index 56ceb84..b98a03a 100644 --- a/Edikoyo/Countries/Drenvale.md +++ b/Edikoyo/Countries/Drenvale.md @@ -1,6 +1,6 @@ --- -short: +short: Diesel Kingdom flag: "![[drenvale.png]]" -capital: -language: +capital: +language: --- diff --git a/Edikoyo/Countries/Faelani.md b/Edikoyo/Countries/Faelani.md index f2ca905..fce7b58 100644 --- a/Edikoyo/Countries/Faelani.md +++ b/Edikoyo/Countries/Faelani.md @@ -1,5 +1,5 @@ --- -short: +short: Fairy Forest flag: "![[faelani.png]]" capital: language: diff --git a/Edikoyo/Countries/Falaka.md b/Edikoyo/Countries/Falaka.md index 0e21935..7c2438a 100644 --- a/Edikoyo/Countries/Falaka.md +++ b/Edikoyo/Countries/Falaka.md @@ -1,5 +1,5 @@ --- -short: +short: The Empire of Flames flag: "![[falaka.png]]" capital: language: diff --git a/Edikoyo/Countries/Felmyr.md b/Edikoyo/Countries/Felmyr.md index 98f5def..0149689 100644 --- a/Edikoyo/Countries/Felmyr.md +++ b/Edikoyo/Countries/Felmyr.md @@ -1,5 +1,5 @@ --- -short: +short: Draconic Temples flag: "![[felmyr.png]]" capital: language: diff --git a/Edikoyo/Countries/Gokolm.md b/Edikoyo/Countries/Gokolm.md index 196a961..762106e 100644 --- a/Edikoyo/Countries/Gokolm.md +++ b/Edikoyo/Countries/Gokolm.md @@ -1,5 +1,5 @@ --- -short: +short: Mechanical Wasteland flag: "![[gokolm.png]]" capital: language: diff --git a/Edikoyo/Countries/Gudoko.md b/Edikoyo/Countries/Gudoko.md index d484183..8c58bd6 100644 --- a/Edikoyo/Countries/Gudoko.md +++ b/Edikoyo/Countries/Gudoko.md @@ -1,5 +1,5 @@ --- -short: +short: Unified Miners flag: "![[gudoko.png]]" capital: language: diff --git a/Edikoyo/Countries/Hanoka.md b/Edikoyo/Countries/Hanoka.md index 26df8d5..db853c8 100644 --- a/Edikoyo/Countries/Hanoka.md +++ b/Edikoyo/Countries/Hanoka.md @@ -1,5 +1,5 @@ --- -short: +short: Harbringers of Peace flag: "![[hanoka.png]]" capital: language: diff --git a/Edikoyo/Countries/Krakala.md b/Edikoyo/Countries/Krakala.md index 0d80e36..88e0044 100644 --- a/Edikoyo/Countries/Krakala.md +++ b/Edikoyo/Countries/Krakala.md @@ -1,5 +1,5 @@ --- -short: +short: The Merchant Capital flag: "![[krakala.png]]" capital: language: diff --git a/Edikoyo/Countries/Lavaki.md b/Edikoyo/Countries/Lavaki.md index 04f82a5..9dbdf2b 100644 --- a/Edikoyo/Countries/Lavaki.md +++ b/Edikoyo/Countries/Lavaki.md @@ -1,5 +1,5 @@ --- -short: +short: Volcanic Ridge flag: "![[lavaki.png]]" capital: language: diff --git a/Edikoyo/Countries/Lekia.md b/Edikoyo/Countries/Lekia.md index 596085d..6a668c0 100644 --- a/Edikoyo/Countries/Lekia.md +++ b/Edikoyo/Countries/Lekia.md @@ -1,5 +1,5 @@ --- -short: +short: Marshy Jungles flag: "![[lekia.png]]" capital: language: diff --git a/Edikoyo/Countries/Llasuki.md b/Edikoyo/Countries/Llasuki.md index b237bf4..3db2848 100644 --- a/Edikoyo/Countries/Llasuki.md +++ b/Edikoyo/Countries/Llasuki.md @@ -1,5 +1,5 @@ --- -short: +short: Realm of the Gods flag: "![[llasuki.png]]" capital: language: diff --git a/Edikoyo/Countries/Mantine.md b/Edikoyo/Countries/Mantine.md index b92d14f..a10a0e5 100644 --- a/Edikoyo/Countries/Mantine.md +++ b/Edikoyo/Countries/Mantine.md @@ -1,5 +1,5 @@ --- -short: +short: Deep Shores flag: "![[mantine.png]]" capital: language: diff --git a/content/Countries/Blanchister.md b/content/Countries/Blanchister.md index ad82115..8bc44ed 100644 --- a/content/Countries/Blanchister.md +++ b/content/Countries/Blanchister.md @@ -1,5 +1,5 @@ --- -short: null +short: The Realm of Nomads flag: '![[blanchister.png]]' language: null capital: null diff --git a/content/Countries/Calcetron.md b/content/Countries/Calcetron.md index 9021aed..24ad9bd 100644 --- a/content/Countries/Calcetron.md +++ b/content/Countries/Calcetron.md @@ -1,5 +1,5 @@ --- -short: null +short: The Electric Republic flag: '![[calcetron.png]]' language: null capital: null diff --git a/content/Countries/Dahallow.md b/content/Countries/Dahallow.md index 5acbd7e..718e10d 100644 --- a/content/Countries/Dahallow.md +++ b/content/Countries/Dahallow.md @@ -1,5 +1,5 @@ --- -short: null +short: The Blooming Kingdom flag: '![[dahallow.png]]' language: null capital: null diff --git a/content/Countries/Dolfeyja.md b/content/Countries/Dolfeyja.md index c57020c..352f5fb 100644 --- a/content/Countries/Dolfeyja.md +++ b/content/Countries/Dolfeyja.md @@ -1,5 +1,5 @@ --- -short: null +short: The Peaceful Summit flag: '![[dolfeyja.png]]' language: '[[Edikan]]' capital: null diff --git a/content/Countries/Dratana.md b/content/Countries/Dratana.md index 27df267..14768c0 100644 --- a/content/Countries/Dratana.md +++ b/content/Countries/Dratana.md @@ -1,5 +1,5 @@ --- -short: null +short: Realm of Dragons flag: '![[dratana.png]]' capital: null language: null diff --git a/content/Countries/Drenvale.md b/content/Countries/Drenvale.md index fd3d1f9..d5ad982 100644 --- a/content/Countries/Drenvale.md +++ b/content/Countries/Drenvale.md @@ -1,5 +1,5 @@ --- -short: null +short: Diesel Kingdom flag: '![[drenvale.png]]' capital: null language: null diff --git a/content/Countries/Faelani.md b/content/Countries/Faelani.md index 95c66e1..685fdf8 100644 --- a/content/Countries/Faelani.md +++ b/content/Countries/Faelani.md @@ -1,5 +1,5 @@ --- -short: null +short: Fairy Forest flag: '![[faelani.png]]' capital: null language: null diff --git a/content/Countries/Falaka.md b/content/Countries/Falaka.md index 968ef6a..b8348cc 100644 --- a/content/Countries/Falaka.md +++ b/content/Countries/Falaka.md @@ -1,5 +1,5 @@ --- -short: null +short: The Empire of Flames flag: '![[falaka.png]]' capital: null language: null diff --git a/content/Countries/Felmyr.md b/content/Countries/Felmyr.md index fddde89..064b9a6 100644 --- a/content/Countries/Felmyr.md +++ b/content/Countries/Felmyr.md @@ -1,5 +1,5 @@ --- -short: null +short: Draconic Temples flag: '![[felmyr.png]]' capital: null language: null diff --git a/content/Countries/Gokolm.md b/content/Countries/Gokolm.md index ec264ab..8544778 100644 --- a/content/Countries/Gokolm.md +++ b/content/Countries/Gokolm.md @@ -1,5 +1,5 @@ --- -short: null +short: Mechanical Wasteland flag: '![[gokolm.png]]' capital: null language: null diff --git a/content/Countries/Gudoko.md b/content/Countries/Gudoko.md index 523276b..86c9458 100644 --- a/content/Countries/Gudoko.md +++ b/content/Countries/Gudoko.md @@ -1,5 +1,5 @@ --- -short: null +short: Unified Miners flag: '![[gudoko.png]]' capital: null language: null diff --git a/content/Countries/Hanoka.md b/content/Countries/Hanoka.md index cfa8f95..e7746d2 100644 --- a/content/Countries/Hanoka.md +++ b/content/Countries/Hanoka.md @@ -1,5 +1,5 @@ --- -short: null +short: Harbringers of Peace flag: '![[hanoka.png]]' capital: null language: null diff --git a/content/Countries/Krakala.md b/content/Countries/Krakala.md index 4b7b387..7ef018f 100644 --- a/content/Countries/Krakala.md +++ b/content/Countries/Krakala.md @@ -1,5 +1,5 @@ --- -short: null +short: The Merchant Capital flag: '![[krakala.png]]' capital: null language: null diff --git a/content/Countries/Lavaki.md b/content/Countries/Lavaki.md index 53fbaf0..5d59ce2 100644 --- a/content/Countries/Lavaki.md +++ b/content/Countries/Lavaki.md @@ -1,5 +1,5 @@ --- -short: null +short: Volcanic Ridge flag: '![[lavaki.png]]' capital: null language: null diff --git a/content/Countries/Lekia.md b/content/Countries/Lekia.md index 017c926..f30e834 100644 --- a/content/Countries/Lekia.md +++ b/content/Countries/Lekia.md @@ -1,5 +1,5 @@ --- -short: null +short: Marshy Jungles flag: '![[lekia.png]]' capital: null language: null diff --git a/content/Countries/Llasuki.md b/content/Countries/Llasuki.md index 0e7bca9..00af84c 100644 --- a/content/Countries/Llasuki.md +++ b/content/Countries/Llasuki.md @@ -1,5 +1,5 @@ --- -short: null +short: Realm of the Gods flag: '![[llasuki.png]]' capital: null language: null diff --git a/content/Countries/Mantine.md b/content/Countries/Mantine.md index 1a12395..2376fe5 100644 --- a/content/Countries/Mantine.md +++ b/content/Countries/Mantine.md @@ -1,5 +1,5 @@ --- -short: null +short: Deep Shores flag: '![[mantine.png]]' capital: null language: null diff --git a/content/Countries/Mortham.md b/content/Countries/Mortham.md index 0bed378..ba29ce1 100644 --- a/content/Countries/Mortham.md +++ b/content/Countries/Mortham.md @@ -1,5 +1,5 @@ --- -short: null +short: Pirate Bay flag: '![[mortham.png]]' 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 -````