Compare commits

..

No commits in common. "93c2681ed8771089072ceb90f3ff33de8df39799" and "168de9e545c24038e01b533b9d7a3e911a2bc6b1" have entirely different histories.

5 changed files with 24 additions and 59 deletions

View file

@ -37,38 +37,25 @@
"state": { "state": {
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Countries/_index.md", "file": "Animals/Slimes/_index.md",
"mode": "source", "mode": "source",
"source": false "source": false
} }
} }
}, },
{ {
"id": "6e9264aa36b7c209", "id": "012199ac4431105d",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "markdown", "type": "diff-view",
"state": { "state": {
"file": "Animals/Cat.md", "file": "Edikoyo/.obsidian/workspace.json",
"mode": "source", "staged": false
"source": false
} }
} }
}, },
{ {
"id": "a12c575a3e4e2f21", "id": "832f0e22f10664bb",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Animals/Slimes/Ababa Slime.md",
"mode": "source",
"source": false
}
}
},
{
"id": "e18161b255f8c3cb",
"type": "leaf", "type": "leaf",
"state": { "state": {
"type": "diff-view", "type": "diff-view",
@ -79,7 +66,7 @@
} }
} }
], ],
"currentTab": 5 "currentTab": 4
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -198,47 +185,47 @@
} }
], ],
"direction": "horizontal", "direction": "horizontal",
"width": 300 "width": 603.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": "e18161b255f8c3cb", "active": "832f0e22f10664bb",
"lastOpenFiles": [ "lastOpenFiles": [
"conflict-files-obsidian-git.md", "conflict-files-obsidian-git.md",
"Animals/Slimes/_index.md",
"Animals/Slimes/Ababa Slime.md", "Animals/Slimes/Ababa Slime.md",
"Animals/_index.md", "Animals/_index.md",
"Animals/Slimes/_index.md",
"Test One.md",
"Animals/Slimes/Test.md",
"Animals/Cat.md", "Animals/Cat.md",
"Animals/Dog.md",
"Countries/_index.md",
"Animals/Slimes", "Animals/Slimes",
"Cultures/_index.md", "Cultures/_index.md",
"Countries/Blanchister.md",
"Continents/_index.md", "Continents/_index.md",
"Cities/_index.md", "Cities/_index.md",
"Countries/Barrowmaw.md", "Countries/Barrowmaw.md",
"Countries/Blanchister.md",
"Animals/Taura.md", "Animals/Taura.md",
"Animals/Slom.md", "Animals/Slom.md",
"Animals/Slime.md", "Animals/Dog.md",
"Languages/Edikan.md", "Languages/Edikan.md",
"Cities/Crester.md", "Cities/Crester.md",
"Cities/Bririe.md", "Cities/Bririe.md",
"Countries/_index.md",
"Countries/Drenvale.md", "Countries/Drenvale.md",
"Countries/Dasona.md", "Countries/Dasona.md",
"Countries/Dolfeyja.md", "Countries/Dolfeyja.md",
"Countries/Dratana.md", "Countries/Dratana.md",
"Countries/Dahallow.md", "Countries/Dahallow.md",
"Countries/Calcetron.md", "Countries/Calcetron.md",
"Countries/Batanoka.md",
"Cities/Nanera.md",
"Languages/_index.md",
"Languages", "Languages",
"Images/Flags/vosaka.png", "Images/Flags/vosaka.png",
"Images/Flags/vikogyna.png", "Images/Flags/vikogyna.png",

View file

@ -2,7 +2,7 @@
Instances of the “Ababa” Slime are found within many historical scripts from many different cultures.  Instances of the “Ababa” Slime are found within many historical scripts from many different cultures. 
Even before the formation of [[Dasona]], pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/.  Even before the formation of ![](https://lh7-rt.googleusercontent.com/docsz/AD_4nXdjzFW2lbntnHCw2cGLDKSU1vvxhFzzlg8JP-1zE7QLBO6lBrQ02OB_eBYCzMf86-rk1BsOck-77cLBrD5beoEz6TqXwgiXPmVh1ThUrq4HRk8hM2rt6__IoiLLAgtDy1N98qvRDpLGW9L_bWeGLcVwoME?key=bnI7Woon4tEfL42TRpP0aQ)Dasona, pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/. 
Some researchers argue that the origin of the Slime itself is so ancient that its naming has maintained itself through time, reaching us today. Some theories behind the etymology of “Ababa” explain that most probably, Ababa is a way of phonetically depicting the creatures shape. Rapidly opening and closing the mouth, depicting the wavy shape. Some researchers argue that the origin of the Slime itself is so ancient that its naming has maintained itself through time, reaching us today. Some theories behind the etymology of “Ababa” explain that most probably, Ababa is a way of phonetically depicting the creatures shape. Rapidly opening and closing the mouth, depicting the wavy shape.

View file

@ -5,7 +5,7 @@
Instances of the “Ababa” Slime are found within many historical scripts from many different cultures.  Instances of the “Ababa” Slime are found within many historical scripts from many different cultures. 
Even before the formation of [Dasona](..\..\Countries\Dasona.md), pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/.  Even before the formation of ![](https://lh7-rt.googleusercontent.com/docsz/AD_4nXdjzFW2lbntnHCw2cGLDKSU1vvxhFzzlg8JP-1zE7QLBO6lBrQ02OB_eBYCzMf86-rk1BsOck-77cLBrD5beoEz6TqXwgiXPmVh1ThUrq4HRk8hM2rt6__IoiLLAgtDy1N98qvRDpLGW9L_bWeGLcVwoME?key=bnI7Woon4tEfL42TRpP0aQ)Dasona, pre-amalgamation cultures reference the existence of “Åba Slôm” /ɔ:bæ ʃlɔɪm/ that would later evolve into “Ababa Slime” /æbæbæ slaɪm/. 
Some researchers argue that the origin of the Slime itself is so ancient that its naming has maintained itself through time, reaching us today. Some theories behind the etymology of “Ababa” explain that most probably, Ababa is a way of phonetically depicting the creatures shape. Rapidly opening and closing the mouth, depicting the wavy shape. Some researchers argue that the origin of the Slime itself is so ancient that its naming has maintained itself through time, reaching us today. Some theories behind the etymology of “Ababa” explain that most probably, Ababa is a way of phonetically depicting the creatures shape. Rapidly opening and closing the mouth, depicting the wavy shape.

View file

@ -1,4 +1,4 @@
--- ---
--- ---
[Ababa Slime](Ababa%20Slime.md) Ababa Slime

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