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

vault backup: 2024-09-07 07:57:00

Browse source
This commit is contained in:
noah cuadrado 2024-09-07 07:57:00 +02:00
commit 422b973088
4 changed files with 62 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -132,9 +132,20 @@
"source": false
}
}
},
{
"id": "68af507ebd93d4fd",
"type": "leaf",
"state": {
"type": "diff-view",
"state": {
"file": "content/Animals/Slimes/Ababa Slime.md",
"staged": true
}
}
}
],
"currentTab": 8
"currentTab": 9
}
],
"direction": "vertical"
@ -200,7 +211,6 @@
"state": {
"type": "backlink",
"state": {
"file": "Animals/Slimes/_index.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -217,7 +227,6 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "Animals/Slimes/_index.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@ -239,9 +248,7 @@
"type": "leaf",
"state": {
"type": "outline",
"state": {
"file": "Animals/Slimes/_index.md"
}
"state": {}
}
},
{
@ -269,16 +276,16 @@
"obsidian-git:Open Git source control": false
}
},
"active": "0b8bff69287ad9fb",
"active": "68af507ebd93d4fd",
"lastOpenFiles": [
"Countries/_index.md",
"conflict-files-obsidian-git.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Untitled.md",
"Animals/Slimes/_index.md",
"Countries/Faelani.md",
"Countries/_index.md",
"Countries/Dolfeyja.md",
"Countries/Felmyr.md",
"conflict-files-obsidian-git.md",
"Countries/Vosaka.md",
"Countries/Vikogyna.md",
"Countries/Vanatn.md",

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