Compare commits

..

No commits in common. "f81845c8d40db5ee24282cc410afc468ae3308a6" and "bed4c6f3d01421223d680cdc3799be8c96fd69d3" have entirely different histories.

22 changed files with 174 additions and 128 deletions

View file

@ -6,69 +6,39 @@
{
"id": "16de56932df8d2b5",
"type": "tabs",
"dimension": 16.366612111292962,
"children": [
{
"id": "f84169dad44b3808",
"id": "65374afab15971d2",
"type": "leaf",
"state": {
"type": "markdown",
"type": "image",
"state": {
"file": "Countries/Blanchister.md",
"mode": "source",
"source": false
"file": "Images/slimes/ababa/ababa-1.png"
}
}
},
}
]
},
{
"id": "a776313f551069bd",
"type": "tabs",
"dimension": 83.63338788870703,
"children": [
{
"id": "987a006f259c3c08",
"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",
"id": "c400fd62d021c702",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "source",
"source": false
"source": true
}
}
},
{
"id": "e18161b255f8c3cb",
"id": "d186fdb7d8783998",
"type": "leaf",
"state": {
"type": "markdown",
@ -80,41 +50,124 @@
}
},
{
"id": "6e65a1802f52d161",
"id": "3828af17ae2bbb6a",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Countries/Vosaka.md",
"mode": "source",
"source": true
}
}
},
{
"id": "6dd42c89cd0a32cf",
"type": "leaf",
"state": {
"type": "image",
"state": {
"file": "Images/Slimes/ababa/ababa-3.png"
}
}
},
{
"id": "950e4982a8d56b3d",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"file": "Countries/_index.md",
"mode": "source",
"source": false
}
}
},
{
"id": "cd8543c15ea2f09f",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"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": "Animals/Slimes/_index.md",
"mode": "preview",
"source": false
}
}
},
{
"id": "0b8bff69287ad9fb",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/_index.md",
"mode": "source",
"source": false
}
}
},
{
"id": "68af507ebd93d4fd",
"type": "leaf",
"state": {
"type": "diff-view",
"state": {
"file": "content/Countries/_index.md",
"staged": true
}
}
},
{
"id": "bfd0d82c27739a48",
"type": "leaf",
"state": {
"type": "diff-view",
"state": {
"file": "content/Countries/Blanchister.md",
"staged": true
}
}
},
{
"id": "0e473423f5963692",
"type": "leaf",
"state": {
"type": "diff-view",
"state": {
"file": "Edikoyo/conflict-files-obsidian-git.md",
"staged": false
}
}
}
],
"currentTab": 8
"currentTab": 11
}
],
"direction": "vertical"
@ -180,7 +233,6 @@
"state": {
"type": "backlink",
"state": {
"file": "conflict-files-obsidian-git.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
@ -197,7 +249,6 @@
"state": {
"type": "outgoing-link",
"state": {
"file": "conflict-files-obsidian-git.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
@ -219,9 +270,7 @@
"type": "leaf",
"state": {
"type": "outline",
"state": {
"file": "conflict-files-obsidian-git.md"
}
"state": {}
}
},
{
@ -237,65 +286,64 @@
}
],
"direction": "horizontal",
"width": 300
"width": 695.5
},
"left-ribbon": {
"hiddenItems": {
"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,
"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,
"obsidian-git:Open Git source control": false
}
},
"active": "fdbd8ce5e8a10389",
"active": "0e473423f5963692",
"lastOpenFiles": [
"Images/Slimes",
"Images/Slimes/ababa/ababa-3.png",
"conflict-files-obsidian-git.md",
"Images/Slimes/ababa/ababa-2.png",
"Images/Slimes/ababa/ababa-1.png",
"Images/Slimes/ababa/ababa-4.png",
"Languages/Mokrixi.md",
"Languages/Lacelian.md",
"Languages/Guo.md",
"Languages/Fayahi.md",
"Languages/Edikan.md",
"Languages/_index.md",
"Countries/_index.md",
"Countries/Dolfeyja.md",
"Countries/Dasona.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Ababa Slime.md",
"Animals/Slimes/Untitled.md",
"Countries/Faelani.md",
"Countries/Gudoko.md",
"Countries/Lekia.md",
"Countries/Nakadon.md",
"Countries/Nonkur.md",
"Countries/Nasahra.md",
"Countries/Oshela.md",
"Countries/Soljord.md",
"Countries/Vikogyna.md",
"Countries/Dolfeyja.md",
"Countries/Felmyr.md",
"Countries/Vosaka.md",
"Countries/Vikogyna.md",
"Countries/Vanatn.md",
"Countries/Soljord.md",
"Countries/Seraphis.md",
"Countries/Ovanos.md",
"Countries/Oshela.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",
"Countries/Mortham.md",
"Countries/Mantine.md",
"Images/Slimes/ababa",
"Countries/Llasuki.md",
"Countries/Lekia.md",
"Countries/Lavaki.md",
"Countries/Krakala.md",
"Countries/Hanoka.md",
"Countries/Gudoko.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"
"Territories",
"Provinces"
]
}

View file

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -1 +1 @@
To be added
Test

View file

@ -1 +1 @@
To be added
Test

View file

@ -1 +1 @@
To be added
Test

View file

@ -1 +1 @@
To be added
Test

View file

@ -1 +1 @@
To be added
Test

View file

@ -1 +0,0 @@
To be added

View file

@ -6,8 +6,7 @@
|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](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)|
|[Untitled](Untitled.md)|-|-|-|-|-|-|-|
|[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

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

Before

Width:  |  Height:  |  Size: 6.6 KiB

After

Width:  |  Height:  |  Size: 6.6 KiB

View file

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View file

@ -1,4 +1,4 @@
---
---
To be added
Test

View file

@ -1,4 +1,4 @@
---
---
To be added
Test

View file

@ -1,4 +1,4 @@
---
---
To be added
Test

View file

@ -1,4 +1,4 @@
---
---
To be added
Test

View file

@ -1,4 +1,4 @@
---
---
To be added
Test

View file

@ -1,4 +1,4 @@
---
---
To be added