diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index 029af08..ef68056 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -102,9 +102,21 @@ "source": false } } + }, + { + "id": "22c283177fda2e48", + "type": "leaf", + "state": { + "type": "markdown", + "state": { + "file": "conflict-files-obsidian-git.md", + "mode": "source", + "source": false + } + } } ], - "currentTab": 7 + "currentTab": 8 } ], "direction": "vertical" @@ -170,7 +182,7 @@ "state": { "type": "backlink", "state": { - "file": "Countries/_index.md", + "file": "conflict-files-obsidian-git.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -187,7 +199,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "Countries/_index.md", + "file": "conflict-files-obsidian-git.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -210,7 +222,7 @@ "state": { "type": "outline", "state": { - "file": "Countries/_index.md" + "file": "conflict-files-obsidian-git.md" } } }, @@ -239,13 +251,14 @@ "obsidian-git:Open Git source control": false } }, - "active": "6dd42c89cd0a32cf", + "active": "22c283177fda2e48", "lastOpenFiles": [ + "Countries/_index.md", + "conflict-files-obsidian-git.md", "Countries/Dratana.md", "Countries/Drenvale.md", "Countries/Faelani.md", "Countries/Hanoka.md", - "conflict-files-obsidian-git.md", "Countries/Vosaka.md", "Images/slimes/ababa/ababa-3.png", "Images/slimes/ababa/ababa-4.png", @@ -272,7 +285,6 @@ "Countries/Gokolm.md", "Countries/Felmyr.md", "Countries/Falaka.md", - "Countries/Dolfeyja.md", "Countries/Faelani", "Images/Flags/barrowmaw.png", "Animals/Slimes", diff --git a/Edikoyo/Animals/Slimes/Ababa Slime.md b/Edikoyo/Animals/Slimes/Ababa Slime.md index 69e9257..a69825c 100644 --- a/Edikoyo/Animals/Slimes/Ababa Slime.md +++ b/Edikoyo/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]]" --- diff --git a/content/Animals/Slimes/Ababa Slime.md b/content/Animals/Slimes/Ababa Slime.md index 5751368..b0686d1 100644 --- a/content/Animals/Slimes/Ababa Slime.md +++ b/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]]' --- diff --git a/content/conflict-files-obsidian-git.md b/content/conflict-files-obsidian-git.md new file mode 100644 index 0000000..f44af68 --- /dev/null +++ b/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 +````