Compare commits

..

No commits in common. "e39fa66e56110b5c232012a4f07310cbc7f60902" and "5b292c9cfea3b404df9a7768b5687b319dc16f00" have entirely different histories.

25 changed files with 123 additions and 141 deletions

View file

@ -6,69 +6,39 @@
{ {
"id": "16de56932df8d2b5", "id": "16de56932df8d2b5",
"type": "tabs", "type": "tabs",
"dimension": 16.366612111292962,
"children": [ "children": [
{ {
"id": "f84169dad44b3808", "id": "65374afab15971d2",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "image",
"state": { "state": {
"file": "Countries/Blanchister.md", "file": "Images/slimes/ababa/ababa-1.png"
"mode": "source",
"source": false
} }
} }
}, }
]
},
{
"id": "a776313f551069bd",
"type": "tabs",
"dimension": 83.63338788870703,
"children": [
{ {
"id": "987a006f259c3c08", "id": "c400fd62d021c702",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Countries/Dasona.md",
"mode": "source",
"source": false
}
}
},
{
"id": "afb42427bcca10d5",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Countries/_index.md",
"mode": "source",
"source": false
}
}
},
{
"id": "6e9264aa36b7c209",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Cat.md",
"mode": "source",
"source": false
}
}
},
{
"id": "a12c575a3e4e2f21",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Animals/Slimes/Ababa Slime.md", "file": "Animals/Slimes/Ababa Slime.md",
"mode": "source", "mode": "source",
"source": false "source": true
} }
} }
}, },
{ {
"id": "e18161b255f8c3cb", "id": "d186fdb7d8783998",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
@ -80,25 +50,74 @@
} }
}, },
{ {
"id": "6e65a1802f52d161", "id": "3828af17ae2bbb6a",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Countries/Vosaka.md", "file": "Countries/_index.md",
"mode": "source", "mode": "source",
"source": true "source": false
} }
} }
}, },
{ {
"id": "6dd42c89cd0a32cf", "id": "cd8543c15ea2f09f",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "diff-view", "type": "markdown",
"state": { "state": {
"file": "Edikoyo/.obsidian/workspace.json", "file": "Animals/Slimes/_index.md",
"staged": false "mode": "source",
"source": false
}
}
},
{
"id": "6ad99838c94a15dd",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "source",
"source": false
}
}
},
{
"id": "a289d6327d739306",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"mode": "source",
"source": false
}
}
},
{
"id": "b704e930ac81712d",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "preview",
"source": false
}
}
},
{
"id": "efb1a9199c2e99b6",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Countries/_index.md",
"mode": "preview",
"source": false
} }
} }
} }
@ -206,7 +225,9 @@
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "outline", "type": "outline",
"state": {} "state": {
"file": "conflict-files-obsidian-git.md"
}
} }
}, },
{ {
@ -222,34 +243,33 @@
} }
], ],
"direction": "horizontal", "direction": "horizontal",
"width": 300 "width": 695.5
}, },
"left-ribbon": { "left-ribbon": {
"hiddenItems": { "hiddenItems": {
"random-note:Open random note": false, "switcher:Abrir selector rápido": false,
"switcher:Open quick switcher": false, "graph:Abrir vista gráfica": false,
"graph:Open graph view": false, "templates:Insertar plantilla": false,
"templates:Insert template": false, "command-palette:Abrir paleta de comandos": false,
"command-palette:Open command palette": false, "random-note:Abrir nota al azar": false,
"obsidian-git:Open Git source control": false "obsidian-git:Open Git source control": false
} }
}, },
"active": "6dd42c89cd0a32cf", "active": "90b57f41c87f2b3b",
"lastOpenFiles": [ "lastOpenFiles": [
"Countries/_index.md",
"conflict-files-obsidian-git.md", "conflict-files-obsidian-git.md",
"Countries/Vosaka.md", "Images/flags/nonkur.png",
"Images/slimes/ababa/ababa-3.png", "Images/flags/nasahra.png",
"Images/slimes/ababa/ababa-4.png", "Images/flags/nakadon.png",
"Images/slimes/ababa/ababa-2.png", "Images/flags/mortham.png",
"Images/slimes/ababa/ababa-1.png", "Images/flags/mantine.png",
"Images/slimes/ababa", "Images/flags/llasuki.png",
"Images/slimes", "Images/flags/lekia.png",
"Countries/Vikogyna.md", "Images/flags/lavaki.png",
"Countries/Vanatn.md", "Images/flags/krakala.png",
"Countries/Soljord.md", "Images/flags/hanoka.png",
"Countries/Seraphis.md", "Images/Flags",
"Countries/Ovanos.md",
"Countries/Oshela.md",
"Countries/Nonkur.md", "Countries/Nonkur.md",
"Countries/Nasahra.md", "Countries/Nasahra.md",
"Countries/Nakadon.md", "Countries/Nakadon.md",
@ -265,22 +285,21 @@
"Countries/Felmyr.md", "Countries/Felmyr.md",
"Countries/Falaka.md", "Countries/Falaka.md",
"Countries/Faelani.md", "Countries/Faelani.md",
"Countries/Dolfeyja.md", "Animals/Slimes/Untitled.md",
"Countries/Dratana.md", "Animals/Slimes/_index.md",
"Countries/Drenvale.md", "Animals/Slimes/Ababa Slime.md",
"Countries/Faelani", "Continents/_index.md",
"Images/Flags/barrowmaw.png", "Animals/_index.md",
"Images/slimes/ababa",
"Images/slimes",
"Countries/Barrowmaw.md",
"Cities/Bririe.md",
"Cities/_index.md",
"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"
] ]
} }

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[nasahra.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[nonkur.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[oshela.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[ovanos.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[seraphis.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[soljord.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[vanatn.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[vikogyna.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: short:
flag: "![[vosaka.png]]" flag:
capital: capital:
language: language:
--- ---

View file

@ -1,11 +1,4 @@
--- ---
art_variant1: '![[ababa-1.png]]'
art_variant2: '![[ababa-2.png]]'
art_variant3: '![[ababa-3.png]]'
art_golden: '![[ababa-4.png]]'
country_variant1: '[[Batanoka]]'
country_variant2: Faelani
country_variant3: '[[Barrowmaw]]'
--- ---
# On the Ababa Slime # On the Ababa Slime

View file

@ -1,12 +1,4 @@
--- ---
--- ---
<!-- QueryToSerialize: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant", country_variant1 as "Country Variant 1", country_variant2 as "Country Variant 2", country_variant3 as "Country Variant 3" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name --> [Ababa Slime](Ababa%20Slime.md)
<!-- SerializedQuery: TABLE WITHOUT ID file.link as "Slimes", art_variant1 as "Variant 1", art_variant2 as "Variant 2", art_variant3 as "Variant 3", art_golden as "Golden Variant", country_variant1 as "Country Variant 1", country_variant2 as "Country Variant 2", country_variant3 as "Country Variant 3" FROM "Animals/Slimes" WHERE file.name != "_index" SORT file.name -->
|Slimes|Variant 1|Variant 2|Variant 3|Golden Variant|Country Variant 1|Country Variant 2|Country Variant 3|
|------|---------|---------|---------|--------------|-----------------|-----------------|-----------------|
|[Ababa Slime](Ababa%20Slime.md)|![ababa-1.png](..\..\Images\slimes\ababa\ababa-1.png)|![ababa-2.png](..\..\Images\slimes\ababa\ababa-2.png)|![ababa-3.png](..\..\Images\slimes\ababa\ababa-3.png)|![ababa-4.png](..\..\Images\slimes\ababa\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|Faelani|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
<!-- SerializedQuery END -->

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[nonkur.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[oshela.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[ovanos.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[seraphis.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[soljord.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[vanatn.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[vikogyna.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

View file

@ -1,6 +1,6 @@
--- ---
short: null short: null
flag: '![[vosaka.png]]' flag: null
capital: null capital: null
language: null language: null
--- ---

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

View file

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