Compare commits
2 commits
cf9524f9d4
...
44f8a2b159
| Author | SHA1 | Date | |
|---|---|---|---|
|
44f8a2b159 | ||
|
|
d8a140e1fc |
5 changed files with 134 additions and 129 deletions
151
Edikoyo/.obsidian/workspace.json
vendored
151
Edikoyo/.obsidian/workspace.json
vendored
|
|
@ -6,51 +6,33 @@
|
||||||
{
|
{
|
||||||
"id": "16de56932df8d2b5",
|
"id": "16de56932df8d2b5",
|
||||||
"type": "tabs",
|
"type": "tabs",
|
||||||
"dimension": 16.366612111292962,
|
|
||||||
"children": [
|
"children": [
|
||||||
{
|
{
|
||||||
"id": "65374afab15971d2",
|
"id": "f84169dad44b3808",
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "image",
|
|
||||||
"state": {
|
|
||||||
"file": "Images/slimes/ababa/ababa-1.png"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "a776313f551069bd",
|
|
||||||
"type": "tabs",
|
|
||||||
"dimension": 83.63338788870703,
|
|
||||||
"children": [
|
|
||||||
{
|
|
||||||
"id": "c400fd62d021c702",
|
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
"file": "Countries/Blanchister.md",
|
||||||
"mode": "source",
|
|
||||||
"source": true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "d186fdb7d8783998",
|
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "markdown",
|
|
||||||
"state": {
|
|
||||||
"file": "Animals/Slimes/_index.md",
|
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "3828af17ae2bbb6a",
|
"id": "987a006f259c3c08",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Countries/Dasona.md",
|
||||||
|
"mode": "source",
|
||||||
|
"source": false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "afb42427bcca10d5",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
|
|
@ -62,19 +44,19 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "cd8543c15ea2f09f",
|
"id": "6e9264aa36b7c209",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/_index.md",
|
"file": "Animals/Cat.md",
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "6ad99838c94a15dd",
|
"id": "a12c575a3e4e2f21",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
|
|
@ -86,7 +68,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "a289d6327d739306",
|
"id": "e18161b255f8c3cb",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
|
|
@ -98,36 +80,36 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "b704e930ac81712d",
|
"id": "6e65a1802f52d161",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
"file": "Countries/Vosaka.md",
|
||||||
"mode": "preview",
|
"mode": "source",
|
||||||
|
"source": true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"id": "6dd42c89cd0a32cf",
|
||||||
|
"type": "leaf",
|
||||||
|
"state": {
|
||||||
|
"type": "markdown",
|
||||||
|
"state": {
|
||||||
|
"file": "Countries/_index.md",
|
||||||
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": "efb1a9199c2e99b6",
|
"id": "22c283177fda2e48",
|
||||||
"type": "leaf",
|
"type": "leaf",
|
||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/_index.md",
|
"file": "conflict-files-obsidian-git.md",
|
||||||
"mode": "preview",
|
|
||||||
"source": false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "0b8bff69287ad9fb",
|
|
||||||
"type": "leaf",
|
|
||||||
"state": {
|
|
||||||
"type": "markdown",
|
|
||||||
"state": {
|
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
}
|
}
|
||||||
|
|
@ -200,7 +182,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
"file": "conflict-files-obsidian-git.md",
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
|
|
@ -217,7 +199,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md",
|
"file": "conflict-files-obsidian-git.md",
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
}
|
}
|
||||||
|
|
@ -240,7 +222,7 @@
|
||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
"file": "Animals/Slimes/Ababa Slime.md"
|
"file": "conflict-files-obsidian-git.md"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -257,42 +239,39 @@
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"direction": "horizontal",
|
"direction": "horizontal",
|
||||||
"width": 695.5
|
"width": 300
|
||||||
},
|
},
|
||||||
"left-ribbon": {
|
"left-ribbon": {
|
||||||
"hiddenItems": {
|
"hiddenItems": {
|
||||||
"switcher:Abrir selector rápido": false,
|
"random-note:Open random note": false,
|
||||||
"graph:Abrir vista gráfica": false,
|
"switcher:Open quick switcher": false,
|
||||||
"templates:Insertar plantilla": false,
|
"graph:Open graph view": false,
|
||||||
"command-palette:Abrir paleta de comandos": false,
|
"templates:Insert template": false,
|
||||||
"random-note:Abrir nota al azar": false,
|
"command-palette:Open command palette": false,
|
||||||
"obsidian-git:Open Git source control": false
|
"obsidian-git:Open Git source control": false
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"active": "0b8bff69287ad9fb",
|
"active": "22c283177fda2e48",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"Animals/Slimes/Untitled.md",
|
"Countries/_index.md",
|
||||||
"conflict-files-obsidian-git.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",
|
"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/Vikogyna.md",
|
||||||
"Countries/Vanatn.md",
|
"Countries/Vanatn.md",
|
||||||
"Countries/Soljord.md",
|
"Countries/Soljord.md",
|
||||||
"Countries/Seraphis.md",
|
"Countries/Seraphis.md",
|
||||||
"Countries/Ovanos.md",
|
"Countries/Ovanos.md",
|
||||||
"Countries/Oshela.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/Nonkur.md",
|
||||||
"Countries/Nasahra.md",
|
"Countries/Nasahra.md",
|
||||||
"Countries/Nakadon.md",
|
"Countries/Nakadon.md",
|
||||||
|
|
@ -302,19 +281,23 @@
|
||||||
"Countries/Lekia.md",
|
"Countries/Lekia.md",
|
||||||
"Countries/Lavaki.md",
|
"Countries/Lavaki.md",
|
||||||
"Countries/Krakala.md",
|
"Countries/Krakala.md",
|
||||||
"Countries/Hanoka.md",
|
|
||||||
"Countries/Gudoko.md",
|
"Countries/Gudoko.md",
|
||||||
"Countries/Gokolm.md",
|
"Countries/Gokolm.md",
|
||||||
"Countries/Felmyr.md",
|
"Countries/Felmyr.md",
|
||||||
"Countries/Falaka.md",
|
"Countries/Falaka.md",
|
||||||
"Countries/Faelani.md",
|
"Countries/Faelani",
|
||||||
"Images/slimes/ababa",
|
"Images/Flags/barrowmaw.png",
|
||||||
"Images/slimes",
|
|
||||||
"Animals/Slimes",
|
"Animals/Slimes",
|
||||||
"Languages",
|
"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",
|
"Images",
|
||||||
"Regions",
|
"Regions",
|
||||||
"Territories",
|
"Territories"
|
||||||
"Provinces"
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -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 -->
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -4,7 +4,7 @@ art_variant2: '![[ababa-2.png]]'
|
||||||
art_variant3: '![[ababa-3.png]]'
|
art_variant3: '![[ababa-3.png]]'
|
||||||
art_golden: '![[ababa-4.png]]'
|
art_golden: '![[ababa-4.png]]'
|
||||||
country_variant1: '[[Batanoka]]'
|
country_variant1: '[[Batanoka]]'
|
||||||
country_variant2: Faelani
|
country_variant2: '[[Faelani]]'
|
||||||
country_variant3: '[[Barrowmaw]]'
|
country_variant3: '[[Barrowmaw]]'
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -15,28 +15,28 @@
|
||||||
|[Dolfeyja](Dolfeyja.md)||-|-|-|[Edikan](..\Languages\Edikan.md)|
|
|[Dolfeyja](Dolfeyja.md)||-|-|-|[Edikan](..\Languages\Edikan.md)|
|
||||||
|[Dratana](Dratana.md)||-|-|-|-|
|
|[Dratana](Dratana.md)||-|-|-|-|
|
||||||
|[Drenvale](Drenvale.md)||-|-|-|-|
|
|[Drenvale](Drenvale.md)||-|-|-|-|
|
||||||
|[Faelani](Faelani.md)|-|-|-|-|-|
|
|[Faelani](Faelani.md)||-|-|-|-|
|
||||||
|[Falaka](Falaka.md)|-|-|-|-|-|
|
|[Falaka](Falaka.md)||-|-|-|-|
|
||||||
|[Felmyr](Felmyr.md)|-|-|-|-|-|
|
|[Felmyr](Felmyr.md)||-|-|-|-|
|
||||||
|[Gokolm](Gokolm.md)|-|-|-|-|-|
|
|[Gokolm](Gokolm.md)||-|-|-|-|
|
||||||
|[Gudoko](Gudoko.md)|-|-|-|-|-|
|
|[Gudoko](Gudoko.md)||-|-|-|-|
|
||||||
|[Hanoka](Hanoka.md)|-|-|-|-|-|
|
|[Hanoka](Hanoka.md)||-|-|-|-|
|
||||||
|[Krakala](Krakala.md)|-|-|-|-|-|
|
|[Krakala](Krakala.md)||-|-|-|-|
|
||||||
|[Lavaki](Lavaki.md)|-|-|-|-|-|
|
|[Lavaki](Lavaki.md)||-|-|-|-|
|
||||||
|[Lekia](Lekia.md)|-|-|-|-|-|
|
|[Lekia](Lekia.md)||-|-|-|-|
|
||||||
|[Llasuki](Llasuki.md)|-|-|-|-|-|
|
|[Llasuki](Llasuki.md)||-|-|-|-|
|
||||||
|[Mantine](Mantine.md)|-|-|-|-|-|
|
|[Mantine](Mantine.md)||-|-|-|-|
|
||||||
|[Mortham](Mortham.md)|-|-|-|-|-|
|
|[Mortham](Mortham.md)||-|-|-|-|
|
||||||
|[Nakadon](Nakadon.md)|-|-|-|-|-|
|
|[Nakadon](Nakadon.md)||-|-|-|-|
|
||||||
|[Nasahra](Nasahra.md)|-|-|-|-|-|
|
|[Nasahra](Nasahra.md)||-|-|-|-|
|
||||||
|[Nonkur](Nonkur.md)|-|-|-|-|-|
|
|[Nonkur](Nonkur.md)||-|-|-|-|
|
||||||
|[Oshela](Oshela.md)|-|-|-|-|-|
|
|[Oshela](Oshela.md)||-|-|-|-|
|
||||||
|[Ovanos](Ovanos.md)|-|-|-|-|-|
|
|[Ovanos](Ovanos.md)||-|-|-|-|
|
||||||
|[Seraphis](Seraphis.md)|-|-|-|-|-|
|
|[Seraphis](Seraphis.md)||-|-|-|-|
|
||||||
|[Soljord](Soljord.md)|-|-|-|-|-|
|
|[Soljord](Soljord.md)||-|-|-|-|
|
||||||
|[Vanatn](Vanatn.md)|-|-|-|-|-|
|
|[Vanatn](Vanatn.md)||-|-|-|-|
|
||||||
|[Vikogyna](Vikogyna.md)|-|-|-|-|-|
|
|[Vikogyna](Vikogyna.md)||-|-|-|-|
|
||||||
|[Vosaka](Vosaka.md)|-|-|-|-|-|
|
|[Vosaka](Vosaka.md)||-|-|-|-|
|
||||||
|
|
||||||
<!-- SerializedQuery END -->
|
<!-- SerializedQuery END -->
|
||||||
|
|
||||||
|
|
|
||||||
22
content/conflict-files-obsidian-git.md
Normal file
22
content/conflict-files-obsidian-git.md
Normal 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
|
||||||
|
````
|
||||||
Loading…
Reference in a new issue