vault backup: 2024-09-07 00:50:15

Edikoyo/.obsidian/workspace.json

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

Edikoyo/Animals/Slimes/Ababa Slime.md

@@ -2,7 +2,7 @@
 
 Instances of the “Ababa” Slime are found within many historical scripts from many different cultures. 
 
-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/. 
+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/. 
 
   
 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 creature’s shape. Rapidly opening and closing the mouth, depicting the wavy shape.

content/Animals/Slimes/Ababa Slime.md

@@ -5,7 +5,7 @@
 
 Instances of the “Ababa” Slime are found within many historical scripts from many different cultures. 
 
-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/. 
+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/. 
 
 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 creature’s shape. Rapidly opening and closing the mouth, depicting the wavy shape.
 

content/Animals/Slimes/_index.md

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

content/conflict-files-obsidian-git.md

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