Edikoyo/.obsidian/workspace.json

@@ -132,9 +132,20 @@
                 "source": false
               }
             }
+          },
+          {
+            "id": "68af507ebd93d4fd",
+            "type": "leaf",
+            "state": {
+              "type": "diff-view",
+              "state": {
+                "file": "content/Animals/Slimes/Ababa Slime.md",
+                "staged": true
+              }
+            }
           }
         ],
-        "currentTab": 8
+        "currentTab": 9
       }
     ],
     "direction": "vertical"
@@ -200,7 +211,6 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Animals/Slimes/_index.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -217,7 +227,6 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Animals/Slimes/_index.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               }
@@ -239,9 +248,7 @@
             "type": "leaf",
             "state": {
               "type": "outline",
-              "state": {
+              "state": {}
-                "file": "Animals/Slimes/_index.md"
-              }
             }
           },
           {
@@ -269,16 +276,16 @@
       "obsidian-git:Open Git source control": false
     }
   },
-  "active": "0b8bff69287ad9fb",
+  "active": "68af507ebd93d4fd",
   "lastOpenFiles": [
+    "Countries/_index.md",
+    "conflict-files-obsidian-git.md",
+    "Animals/Slimes/_index.md",
     "Animals/Slimes/Ababa Slime.md",
     "Animals/Slimes/Untitled.md",
-    "Animals/Slimes/_index.md",
     "Countries/Faelani.md",
-    "Countries/_index.md",
     "Countries/Dolfeyja.md",
     "Countries/Felmyr.md",
-    "conflict-files-obsidian-git.md",
     "Countries/Vosaka.md",
     "Countries/Vikogyna.md",
     "Countries/Vanatn.md",

content/Animals/Slimes/Ababa Slime.md

@@ -4,7 +4,7 @@ art_variant2: '![[ababa-2.png]]'
 art_variant3: '![[ababa-3.png]]'
 art_golden: '![[ababa-4.png]]'
 country_variant1: '[[Batanoka]]'
-country_variant2: Faelani
+country_variant2: '[[Faelani]]'
 country_variant3: '[[Barrowmaw]]'
 ---
 

content/Countries/_index.md

@@ -15,28 +15,28 @@
 |[Dolfeyja](Dolfeyja.md)|![dolfeyja.png](..\Images\Flags\dolfeyja.png)|-|-|-|[Edikan](..\Languages\Edikan.md)|
 |[Dratana](Dratana.md)|![dratana.png](..\Images\Flags\dratana.png)|-|-|-|-|
 |[Drenvale](Drenvale.md)|![drenvale.png](..\Images\Flags\drenvale.png)|-|-|-|-|
-|[Faelani](Faelani.md)|-|-|-|-|-|
+|[Faelani](Faelani.md)|![faelani.png](..\Images\Flags\faelani.png)|-|-|-|-|
-|[Falaka](Falaka.md)|-|-|-|-|-|
+|[Falaka](Falaka.md)|![falaka.png](..\Images\Flags\falaka.png)|-|-|-|-|
-|[Felmyr](Felmyr.md)|-|-|-|-|-|
+|[Felmyr](Felmyr.md)|![felmyr.png](..\Images\Flags\felmyr.png)|-|-|-|-|
-|[Gokolm](Gokolm.md)|-|-|-|-|-|
+|[Gokolm](Gokolm.md)|![gokolm.png](..\Images\Flags\gokolm.png)|-|-|-|-|
-|[Gudoko](Gudoko.md)|-|-|-|-|-|
+|[Gudoko](Gudoko.md)|![gudoko.png](..\Images\Flags\gudoko.png)|-|-|-|-|
-|[Hanoka](Hanoka.md)|-|-|-|-|-|
+|[Hanoka](Hanoka.md)|![hanoka.png](..\Images\Flags\hanoka.png)|-|-|-|-|
-|[Krakala](Krakala.md)|-|-|-|-|-|
+|[Krakala](Krakala.md)|![krakala.png](..\Images\Flags\krakala.png)|-|-|-|-|
-|[Lavaki](Lavaki.md)|-|-|-|-|-|
+|[Lavaki](Lavaki.md)|![lavaki.png](..\Images\Flags\lavaki.png)|-|-|-|-|
-|[Lekia](Lekia.md)|-|-|-|-|-|
+|[Lekia](Lekia.md)|![lekia.png](..\Images\Flags\lekia.png)|-|-|-|-|
-|[Llasuki](Llasuki.md)|-|-|-|-|-|
+|[Llasuki](Llasuki.md)|![llasuki.png](..\Images\Flags\llasuki.png)|-|-|-|-|
-|[Mantine](Mantine.md)|-|-|-|-|-|
+|[Mantine](Mantine.md)|![mantine.png](..\Images\Flags\mantine.png)|-|-|-|-|
-|[Mortham](Mortham.md)|-|-|-|-|-|
+|[Mortham](Mortham.md)|![mortham.png](..\Images\Flags\mortham.png)|-|-|-|-|
-|[Nakadon](Nakadon.md)|-|-|-|-|-|
+|[Nakadon](Nakadon.md)|![nakadon.png](..\Images\Flags\nakadon.png)|-|-|-|-|
-|[Nasahra](Nasahra.md)|-|-|-|-|-|
+|[Nasahra](Nasahra.md)|![nasahra.png](..\Images\Flags\nasahra.png)|-|-|-|-|
-|[Nonkur](Nonkur.md)|-|-|-|-|-|
+|[Nonkur](Nonkur.md)|![nonkur.png](..\Images\Flags\nonkur.png)|-|-|-|-|
-|[Oshela](Oshela.md)|-|-|-|-|-|
+|[Oshela](Oshela.md)|![oshela.png](..\Images\Flags\oshela.png)|-|-|-|-|
-|[Ovanos](Ovanos.md)|-|-|-|-|-|
+|[Ovanos](Ovanos.md)|![ovanos.png](..\Images\Flags\ovanos.png)|-|-|-|-|
-|[Seraphis](Seraphis.md)|-|-|-|-|-|
+|[Seraphis](Seraphis.md)|![seraphis.png](..\Images\Flags\seraphis.png)|-|-|-|-|
-|[Soljord](Soljord.md)|-|-|-|-|-|
+|[Soljord](Soljord.md)|![soljord.png](..\Images\Flags\soljord.png)|-|-|-|-|
-|[Vanatn](Vanatn.md)|-|-|-|-|-|
+|[Vanatn](Vanatn.md)|![vanatn.png](..\Images\Flags\vanatn.png)|-|-|-|-|
-|[Vikogyna](Vikogyna.md)|-|-|-|-|-|
+|[Vikogyna](Vikogyna.md)|![vikogyna.png](..\Images\Flags\vikogyna.png)|-|-|-|-|
-|[Vosaka](Vosaka.md)|-|-|-|-|-|
+|[Vosaka](Vosaka.md)|![vosaka.png](..\Images\Flags\vosaka.png)|-|-|-|-|
 
 <!-- SerializedQuery END -->
 

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