From f81845c8d40db5ee24282cc410afc468ae3308a6 Mon Sep 17 00:00:00 2001 From: Ategon Date: Sat, 7 Sep 2024 01:58:15 -0400 Subject: [PATCH] vault backup: 2024-09-07 01:58:15 --- Edikoyo/.obsidian/workspace.json | 15 ++++++------ Edikoyo/Images/{ => Slimes}/ababa/ababa-1.png | Bin Edikoyo/Images/{ => Slimes}/ababa/ababa-2.png | Bin Edikoyo/Images/{ => Slimes}/ababa/ababa-3.png | Bin Edikoyo/Images/{ => Slimes}/ababa/ababa-4.png | Bin content/Animals/Slimes/_index.md | 2 +- content/Images/{ => Slimes}/ababa/ababa-1.png | Bin content/Images/{ => Slimes}/ababa/ababa-2.png | Bin content/Images/{ => Slimes}/ababa/ababa-3.png | Bin content/Images/{ => Slimes}/ababa/ababa-4.png | Bin content/conflict-files-obsidian-git.md | 22 ------------------ 11 files changed, 9 insertions(+), 30 deletions(-) rename Edikoyo/Images/{ => Slimes}/ababa/ababa-1.png (100%) rename Edikoyo/Images/{ => Slimes}/ababa/ababa-2.png (100%) rename Edikoyo/Images/{ => Slimes}/ababa/ababa-3.png (100%) rename Edikoyo/Images/{ => Slimes}/ababa/ababa-4.png (100%) rename content/Images/{ => Slimes}/ababa/ababa-1.png (100%) rename content/Images/{ => Slimes}/ababa/ababa-2.png (100%) rename content/Images/{ => Slimes}/ababa/ababa-3.png (100%) rename content/Images/{ => Slimes}/ababa/ababa-4.png (100%) delete mode 100644 content/conflict-files-obsidian-git.md diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index ea2bbcb..ed97236 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -97,7 +97,7 @@ "state": { "type": "image", "state": { - "file": "Images/ababa/ababa-3.png" + "file": "Images/Slimes/ababa/ababa-3.png" } } }, @@ -249,13 +249,14 @@ "obsidian-git:Open Git source control": false } }, - "active": "950e4982a8d56b3d", + "active": "fdbd8ce5e8a10389", "lastOpenFiles": [ - "Images/ababa/ababa-3.png", + "Images/Slimes", + "Images/Slimes/ababa/ababa-3.png", "conflict-files-obsidian-git.md", - "Images/ababa/ababa-2.png", - "Images/ababa/ababa-1.png", - "Images/ababa/ababa-4.png", + "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", @@ -280,7 +281,7 @@ "Countries/Ovanos.md", "Countries/Mortham.md", "Countries/Mantine.md", - "Images/ababa", + "Images/Slimes/ababa", "Images/slimes", "Countries/Faelani", "Images/Flags/barrowmaw.png", diff --git a/Edikoyo/Images/ababa/ababa-1.png b/Edikoyo/Images/Slimes/ababa/ababa-1.png similarity index 100% rename from Edikoyo/Images/ababa/ababa-1.png rename to Edikoyo/Images/Slimes/ababa/ababa-1.png diff --git a/Edikoyo/Images/ababa/ababa-2.png b/Edikoyo/Images/Slimes/ababa/ababa-2.png similarity index 100% rename from Edikoyo/Images/ababa/ababa-2.png rename to Edikoyo/Images/Slimes/ababa/ababa-2.png diff --git a/Edikoyo/Images/ababa/ababa-3.png b/Edikoyo/Images/Slimes/ababa/ababa-3.png similarity index 100% rename from Edikoyo/Images/ababa/ababa-3.png rename to Edikoyo/Images/Slimes/ababa/ababa-3.png diff --git a/Edikoyo/Images/ababa/ababa-4.png b/Edikoyo/Images/Slimes/ababa/ababa-4.png similarity index 100% rename from Edikoyo/Images/ababa/ababa-4.png rename to Edikoyo/Images/Slimes/ababa/ababa-4.png diff --git a/content/Animals/Slimes/_index.md b/content/Animals/Slimes/_index.md index 6ce8075..326a28a 100644 --- a/content/Animals/Slimes/_index.md +++ b/content/Animals/Slimes/_index.md @@ -6,7 +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\ababa\ababa-1.png)|![ababa-2.png](..\..\Images\ababa\ababa-2.png)|![ababa-3.png](..\..\Images\ababa\ababa-3.png)|![ababa-4.png](..\..\Images\ababa\ababa-4.png)|[Batanoka](..\..\Countries\Batanoka.md)|[Faelani](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.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](..\..\Countries\Faelani.md)|[Barrowmaw](..\..\Countries\Barrowmaw.md)| |[Untitled](Untitled.md)|-|-|-|-|-|-|-| diff --git a/content/Images/ababa/ababa-1.png b/content/Images/Slimes/ababa/ababa-1.png similarity index 100% rename from content/Images/ababa/ababa-1.png rename to content/Images/Slimes/ababa/ababa-1.png diff --git a/content/Images/ababa/ababa-2.png b/content/Images/Slimes/ababa/ababa-2.png similarity index 100% rename from content/Images/ababa/ababa-2.png rename to content/Images/Slimes/ababa/ababa-2.png diff --git a/content/Images/ababa/ababa-3.png b/content/Images/Slimes/ababa/ababa-3.png similarity index 100% rename from content/Images/ababa/ababa-3.png rename to content/Images/Slimes/ababa/ababa-3.png diff --git a/content/Images/ababa/ababa-4.png b/content/Images/Slimes/ababa/ababa-4.png similarity index 100% rename from content/Images/ababa/ababa-4.png rename to content/Images/Slimes/ababa/ababa-4.png diff --git a/content/conflict-files-obsidian-git.md b/content/conflict-files-obsidian-git.md deleted file mode 100644 index f44af68..0000000 --- a/content/conflict-files-obsidian-git.md +++ /dev/null @@ -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 -````