Edikoyo/EdikoyoWiki
Edikoyo/EdikoyoWiki
1
1
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: Edikoyo:cf9524f9d4d9ba01bd6a6dfd88766a59f3e040d0
Branches Tags
Edikoyo:main
...
compare: Edikoyo:44f8a2b159e36ea1377caed5e18c6afa3472d16d
Branches Tags
Edikoyo:main

2 commits
cf9524f9d4 ... 44f8a2b159

Author SHA1 Message Date
Ategon
44f8a2b159 vault backup: 2024-09-07 01:46:01 2024-09-07 01:46:02 -04:00
Ategon
d8a140e1fc vault backup: 2024-09-07 01:45:43 2024-09-07 01:45:43 -04:00
5 changed files with 134 additions and 129 deletions
Show stats Expand all files Collapse all files

151
Edikoyo/.obsidian/workspace.json vendored
View file

@ -6,51 +6,33 @@
{
"id": "16de56932df8d2b5",
"type": "tabs",
"dimension": 16.366612111292962,
"children": [
{
"id": "65374afab15971d2",
"type": "leaf",
"state": {
"type": "image",
"state": {
"file": "Images/slimes/ababa/ababa-1.png"
}
}
}
]
},
{
"id": "a776313f551069bd",
"type": "tabs",
"dimension": 83.63338788870703,
"children": [
{
"id": "c400fd62d021c702",
"id": "f84169dad44b3808",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "source",
"source": true
}
}
},
{
"id": "d186fdb7d8783998",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"file": "Countries/Blanchister.md",
"mode": "source",
"source": false
}
}
},
{
"id": "3828af17ae2bbb6a",
"id": "987a006f259c3c08",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Countries/Dasona.md",
"mode": "source",
"source": false
}
}
},
{
"id": "afb42427bcca10d5",
"type": "leaf",
"state": {
"type": "markdown",
@ -62,19 +44,19 @@
}
},
{
"id": "cd8543c15ea2f09f",
"id": "6e9264aa36b7c209",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"file": "Animals/Cat.md",
"mode": "source",
"source": false
}
}
},
{
"id": "6ad99838c94a15dd",
"id": "a12c575a3e4e2f21",
"type": "leaf",
"state": {
"type": "markdown",
@ -86,7 +68,7 @@
}
},
{
"id": "a289d6327d739306",
"id": "e18161b255f8c3cb",
"type": "leaf",
"state": {
"type": "markdown",
@ -98,36 +80,36 @@
}
},
{
"id": "b704e930ac81712d",
"id": "6e65a1802f52d161",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "preview",
"file": "Countries/Vosaka.md",
"mode": "source",
"source": true
}
}
},
{
"id": "6dd42c89cd0a32cf",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Countries/_index.md",
"mode": "source",
"source": false
}
}
},
{
"id": "efb1a9199c2e99b6",
"id": "22c283177fda2e48",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"mode": "preview",
"source": false
}
}
},
{
"id": "0b8bff69287ad9fb",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false
}
@ -200,7 +182,7 @@
"state": {
"type": "backlink",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"file": "conflict-files-obsidian-git.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -217,7 +199,7 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"file": "conflict-files-obsidian-git.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@ -240,7 +222,7 @@
"state": {
"type": "outline",
"state": {
"file": "Animals/Slimes/Ababa Slime.md"
"file": "conflict-files-obsidian-git.md"
}
}
},
@ -257,42 +239,39 @@
}
],
"direction": "horizontal",
"width": 695.5
"width": 300
},
"left-ribbon": {
"hiddenItems": {
"switcher:Abrir selector rápido": false,
"graph:Abrir vista gráfica": false,
"templates:Insertar plantilla": false,
"command-palette:Abrir paleta de comandos": false,
"random-note:Abrir nota al azar": false,
"random-note:Open random note": false,
"switcher:Open quick switcher": false,
"graph:Open graph view": false,
"templates:Insert template": false,
"command-palette:Open command palette": false,
"obsidian-git:Open Git source control": false
}
},
"active": "0b8bff69287ad9fb",
"active": "22c283177fda2e48",
"lastOpenFiles": [
"Animals/Slimes/Untitled.md",
"Countries/_index.md",
"conflict-files-obsidian-git.md",
"Animals/Slimes/_index.md",
"Countries/Dratana.md",
"Countries/Drenvale.md",
"Countries/Faelani.md",
"Countries/Hanoka.md",
"Countries/Vosaka.md",
"Images/slimes/ababa/ababa-3.png",
"Images/slimes/ababa/ababa-4.png",
"Images/slimes/ababa/ababa-2.png",
"Images/slimes/ababa/ababa-1.png",
"Images/slimes/ababa",
"Images/slimes",
"Countries/Vikogyna.md",
"Countries/Vanatn.md",
"Countries/Soljord.md",
"Countries/Seraphis.md",
"Countries/Ovanos.md",
"Countries/Oshela.md",
"Countries/_index.md",
"Images/flags/nonkur.png",
"Images/flags/nasahra.png",
"Images/flags/nakadon.png",
"Images/flags/mortham.png",
"Images/flags/mantine.png",
"Images/flags/llasuki.png",
"Images/flags/lekia.png",
"Images/flags/lavaki.png",
"Images/flags/krakala.png",
"Images/flags/hanoka.png",
"Images/Flags",
"Countries/Nonkur.md",
"Countries/Nasahra.md",
"Countries/Nakadon.md",
@ -302,19 +281,23 @@
"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",
"Images/slimes/ababa",
"Images/slimes",
"Countries/Faelani",
"Images/Flags/barrowmaw.png",
"Animals/Slimes",
"Languages",
"Images/Flags/vosaka.png",
"Images/Flags/vikogyna.png",
"Images/Flags/vanatn.png",
"Images/Flags/soljord.png",
"Images/Flags/seraphis.png",
"Images/Flags",
"Images/Flags",
"Images",
"Regions",
"Territories",
"Provinces"
"Territories"
]
}

44
Edikoyo/Countries/_index.md
View file

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

2
content/Animals/Slimes/Ababa Slime.md
View file

@ -4,7 +4,7 @@ art_variant2: '![[ababa-2.png]]'
art_variant3: '![[ababa-3.png]]'
art_golden: '![[ababa-4.png]]'
country_variant1: '[[Batanoka]]'
country_variant2: Faelani
country_variant2: '[[Faelani]]'
country_variant3: '[[Barrowmaw]]'
---

44
content/Countries/_index.md
View file

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

22
content/conflict-files-obsidian-git.md Normal file
View file

@ -0,0 +1,22 @@
---
---
# 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
````