1
0
Fork 0

Pull Edikoyo-Main into Edikoyo-n04 #1

Merged
n04 merged 107 commits from Edikoyo/EdikoyoWiki:main into main 2024-09-07 23:41:19 +00:00
3 changed files with 49 additions and 49 deletions
Showing only changes of commit d8a140e1fc - Show all commits

View file

@ -97,7 +97,7 @@
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Countries/Dratana.md", "file": "Countries/_index.md",
"mode": "source", "mode": "source",
"source": false "source": false
} }
@ -170,7 +170,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "Countries/Dratana.md", "file": "Countries/_index.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -187,7 +187,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "Countries/Dratana.md", "file": "Countries/_index.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -210,7 +210,7 @@
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {
"file": "Countries/Dratana.md" "file": "Countries/_index.md"
} }
} }
}, },
@ -241,9 +241,9 @@
}, },
"active": "6dd42c89cd0a32cf", "active": "6dd42c89cd0a32cf",
"lastOpenFiles": [ "lastOpenFiles": [
"Countries/Dratana.md",
"Countries/Drenvale.md", "Countries/Drenvale.md",
"Countries/Faelani.md", "Countries/Faelani.md",
"Countries/Dratana.md",
"Countries/Hanoka.md", "Countries/Hanoka.md",
"conflict-files-obsidian-git.md", "conflict-files-obsidian-git.md",
"Countries/Vosaka.md", "Countries/Vosaka.md",

View file

@ -12,28 +12,28 @@
| [[Dolfeyja]] | ![[dolfeyja.png]] | \- | \- | \- | [[Edikan]] | | [[Dolfeyja]] | ![[dolfeyja.png]] | \- | \- | \- | [[Edikan]] |
| [[Dratana]] | ![[dratana.png]] | \- | \- | \- | \- | | [[Dratana]] | ![[dratana.png]] | \- | \- | \- | \- |
| [[Drenvale]] | ![[drenvale.png]] | \- | \- | \- | \- | | [[Drenvale]] | ![[drenvale.png]] | \- | \- | \- | \- |
| [[Faelani]] | \- | \- | \- | \- | \- | | [[Faelani]] | ![[faelani.png]] | \- | \- | \- | \- |
| [[Falaka]] | \- | \- | \- | \- | \- | | [[Falaka]] | ![[falaka.png]] | \- | \- | \- | \- |
| [[Felmyr]] | \- | \- | \- | \- | \- | | [[Felmyr]] | ![[felmyr.png]] | \- | \- | \- | \- |
| [[Gokolm]] | \- | \- | \- | \- | \- | | [[Gokolm]] | ![[gokolm.png]] | \- | \- | \- | \- |
| [[Gudoko]] | \- | \- | \- | \- | \- | | [[Gudoko]] | ![[gudoko.png]] | \- | \- | \- | \- |
| [[Hanoka]] | \- | \- | \- | \- | \- | | [[Hanoka]] | ![[hanoka.png]] | \- | \- | \- | \- |
| [[Krakala]] | \- | \- | \- | \- | \- | | [[Krakala]] | ![[krakala.png]] | \- | \- | \- | \- |
| [[Lavaki]] | \- | \- | \- | \- | \- | | [[Lavaki]] | ![[lavaki.png]] | \- | \- | \- | \- |
| [[Lekia]] | \- | \- | \- | \- | \- | | [[Lekia]] | ![[lekia.png]] | \- | \- | \- | \- |
| [[Llasuki]] | \- | \- | \- | \- | \- | | [[Llasuki]] | ![[llasuki.png]] | \- | \- | \- | \- |
| [[Mantine]] | \- | \- | \- | \- | \- | | [[Mantine]] | ![[mantine.png]] | \- | \- | \- | \- |
| [[Mortham]] | \- | \- | \- | \- | \- | | [[Mortham]] | ![[mortham.png]] | \- | \- | \- | \- |
| [[Nakadon]] | \- | \- | \- | \- | \- | | [[Nakadon]] | ![[nakadon.png]] | \- | \- | \- | \- |
| [[Nasahra]] | \- | \- | \- | \- | \- | | [[Nasahra]] | ![[nasahra.png]] | \- | \- | \- | \- |
| [[Nonkur]] | \- | \- | \- | \- | \- | | [[Nonkur]] | ![[nonkur.png]] | \- | \- | \- | \- |
| [[Oshela]] | \- | \- | \- | \- | \- | | [[Oshela]] | ![[oshela.png]] | \- | \- | \- | \- |
| [[Ovanos]] | \- | \- | \- | \- | \- | | [[Ovanos]] | ![[ovanos.png]] | \- | \- | \- | \- |
| [[Seraphis]] | \- | \- | \- | \- | \- | | [[Seraphis]] | ![[seraphis.png]] | \- | \- | \- | \- |
| [[Soljord]] | \- | \- | \- | \- | \- | | [[Soljord]] | ![[soljord.png]] | \- | \- | \- | \- |
| [[Vanatn]] | \- | \- | \- | \- | \- | | [[Vanatn]] | ![[vanatn.png]] | \- | \- | \- | \- |
| [[Vikogyna]] | \- | \- | \- | \- | \- | | [[Vikogyna]] | ![[vikogyna.png]] | \- | \- | \- | \- |
| [[Vosaka]] | \- | \- | \- | \- | \- | | [[Vosaka]] | ![[vosaka.png]] | \- | \- | \- | \- |
<!-- SerializedQuery END --> <!-- SerializedQuery END -->

View file

@ -15,28 +15,28 @@
|[Dolfeyja](Dolfeyja.md)|![dolfeyja.png](..\Images\Flags\dolfeyja.png)|-|-|-|[Edikan](..\Languages\Edikan.md)| |[Dolfeyja](Dolfeyja.md)|![dolfeyja.png](..\Images\Flags\dolfeyja.png)|-|-|-|[Edikan](..\Languages\Edikan.md)|
|[Dratana](Dratana.md)|![dratana.png](..\Images\Flags\dratana.png)|-|-|-|-| |[Dratana](Dratana.md)|![dratana.png](..\Images\Flags\dratana.png)|-|-|-|-|
|[Drenvale](Drenvale.md)|![drenvale.png](..\Images\Flags\drenvale.png)|-|-|-|-| |[Drenvale](Drenvale.md)|![drenvale.png](..\Images\Flags\drenvale.png)|-|-|-|-|
|[Faelani](Faelani.md)|-|-|-|-|-| |[Faelani](Faelani.md)|![faelani.png](..\Images\Flags\faelani.png)|-|-|-|-|
|[Falaka](Falaka.md)|-|-|-|-|-| |[Falaka](Falaka.md)|![falaka.png](..\Images\Flags\falaka.png)|-|-|-|-|
|[Felmyr](Felmyr.md)|-|-|-|-|-| |[Felmyr](Felmyr.md)|![felmyr.png](..\Images\Flags\felmyr.png)|-|-|-|-|
|[Gokolm](Gokolm.md)|-|-|-|-|-| |[Gokolm](Gokolm.md)|![gokolm.png](..\Images\Flags\gokolm.png)|-|-|-|-|
|[Gudoko](Gudoko.md)|-|-|-|-|-| |[Gudoko](Gudoko.md)|![gudoko.png](..\Images\Flags\gudoko.png)|-|-|-|-|
|[Hanoka](Hanoka.md)|-|-|-|-|-| |[Hanoka](Hanoka.md)|![hanoka.png](..\Images\Flags\hanoka.png)|-|-|-|-|
|[Krakala](Krakala.md)|-|-|-|-|-| |[Krakala](Krakala.md)|![krakala.png](..\Images\Flags\krakala.png)|-|-|-|-|
|[Lavaki](Lavaki.md)|-|-|-|-|-| |[Lavaki](Lavaki.md)|![lavaki.png](..\Images\Flags\lavaki.png)|-|-|-|-|
|[Lekia](Lekia.md)|-|-|-|-|-| |[Lekia](Lekia.md)|![lekia.png](..\Images\Flags\lekia.png)|-|-|-|-|
|[Llasuki](Llasuki.md)|-|-|-|-|-| |[Llasuki](Llasuki.md)|![llasuki.png](..\Images\Flags\llasuki.png)|-|-|-|-|
|[Mantine](Mantine.md)|-|-|-|-|-| |[Mantine](Mantine.md)|![mantine.png](..\Images\Flags\mantine.png)|-|-|-|-|
|[Mortham](Mortham.md)|-|-|-|-|-| |[Mortham](Mortham.md)|![mortham.png](..\Images\Flags\mortham.png)|-|-|-|-|
|[Nakadon](Nakadon.md)|-|-|-|-|-| |[Nakadon](Nakadon.md)|![nakadon.png](..\Images\Flags\nakadon.png)|-|-|-|-|
|[Nasahra](Nasahra.md)|-|-|-|-|-| |[Nasahra](Nasahra.md)|![nasahra.png](..\Images\Flags\nasahra.png)|-|-|-|-|
|[Nonkur](Nonkur.md)|-|-|-|-|-| |[Nonkur](Nonkur.md)|![nonkur.png](..\Images\Flags\nonkur.png)|-|-|-|-|
|[Oshela](Oshela.md)|-|-|-|-|-| |[Oshela](Oshela.md)|![oshela.png](..\Images\Flags\oshela.png)|-|-|-|-|
|[Ovanos](Ovanos.md)|-|-|-|-|-| |[Ovanos](Ovanos.md)|![ovanos.png](..\Images\Flags\ovanos.png)|-|-|-|-|
|[Seraphis](Seraphis.md)|-|-|-|-|-| |[Seraphis](Seraphis.md)|![seraphis.png](..\Images\Flags\seraphis.png)|-|-|-|-|
|[Soljord](Soljord.md)|-|-|-|-|-| |[Soljord](Soljord.md)|![soljord.png](..\Images\Flags\soljord.png)|-|-|-|-|
|[Vanatn](Vanatn.md)|-|-|-|-|-| |[Vanatn](Vanatn.md)|![vanatn.png](..\Images\Flags\vanatn.png)|-|-|-|-|
|[Vikogyna](Vikogyna.md)|-|-|-|-|-| |[Vikogyna](Vikogyna.md)|![vikogyna.png](..\Images\Flags\vikogyna.png)|-|-|-|-|
|[Vosaka](Vosaka.md)|-|-|-|-|-| |[Vosaka](Vosaka.md)|![vosaka.png](..\Images\Flags\vosaka.png)|-|-|-|-|
<!-- SerializedQuery END --> <!-- SerializedQuery END -->