From 8128c6212c2ff1a4d3e7ca0d876e0991736f2866 Mon Sep 17 00:00:00 2001 From: Ategon Date: Sat, 7 Sep 2024 01:41:12 -0400 Subject: [PATCH 1/2] vault backup: 2024-09-07 01:41:12 --- Edikoyo/.obsidian/workspace.json | 26 +++++++++++++------------- Edikoyo/Countries/Nasahra.md | 2 +- Edikoyo/Countries/Nonkur.md | 2 +- Edikoyo/Countries/Oshela.md | 2 +- Edikoyo/Countries/Ovanos.md | 2 +- Edikoyo/Countries/Seraphis.md | 2 +- Edikoyo/Countries/Soljord.md | 2 +- Edikoyo/Countries/Vanatn.md | 2 +- Edikoyo/Countries/Vikogyna.md | 2 +- Edikoyo/Countries/Vosaka.md | 2 +- content/Countries/Nonkur.md | 2 +- content/Countries/Oshela.md | 2 +- content/Countries/Ovanos.md | 2 +- content/Countries/Seraphis.md | 2 +- content/Countries/Soljord.md | 2 +- content/Countries/Vanatn.md | 2 +- content/Countries/Vikogyna.md | 2 +- content/Countries/Vosaka.md | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index d0fc6c4..0815e60 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -85,7 +85,7 @@ "state": { "type": "markdown", "state": { - "file": "Countries/Nakadon.md", + "file": "Countries/Vosaka.md", "mode": "source", "source": true } @@ -158,7 +158,7 @@ "state": { "type": "backlink", "state": { - "file": "Countries/Nakadon.md", + "file": "Countries/Vosaka.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -175,7 +175,7 @@ "state": { "type": "outgoing-link", "state": { - "file": "Countries/Nakadon.md", + "file": "Countries/Vosaka.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -198,7 +198,7 @@ "state": { "type": "outline", "state": { - "file": "Countries/Nakadon.md" + "file": "Countries/Vosaka.md" } } }, @@ -229,6 +229,15 @@ }, "active": "6e65a1802f52d161", "lastOpenFiles": [ + "Countries/Vikogyna.md", + "Countries/Vanatn.md", + "Countries/Soljord.md", + "Countries/Seraphis.md", + "Countries/Ovanos.md", + "Countries/Oshela.md", + "Countries/Nonkur.md", + "Countries/Nasahra.md", + "Countries/Nakadon.md", "Countries/Mortham.md", "Countries/Mantine.md", "Countries/Llasuki.md", @@ -245,15 +254,6 @@ "Countries/Dratana.md", "Countries/Drenvale.md", "Countries/Vosaka.md", - "Countries/Vikogyna.md", - "Countries/Vanatn.md", - "Countries/Soljord.md", - "Countries/Seraphis.md", - "Countries/Ovanos.md", - "Countries/Oshela.md", - "Countries/Nonkur.md", - "Countries/Nasahra.md", - "Countries/Nakadon.md", "Countries/_index.md", "Countries/Faelani", "Images/Flags/barrowmaw.png", diff --git a/Edikoyo/Countries/Nasahra.md b/Edikoyo/Countries/Nasahra.md index f635395..372d8d7 100644 --- a/Edikoyo/Countries/Nasahra.md +++ b/Edikoyo/Countries/Nasahra.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[nasahra.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Nonkur.md b/Edikoyo/Countries/Nonkur.md index f635395..0d4afe9 100644 --- a/Edikoyo/Countries/Nonkur.md +++ b/Edikoyo/Countries/Nonkur.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[nonkur.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Oshela.md b/Edikoyo/Countries/Oshela.md index f635395..a8c0445 100644 --- a/Edikoyo/Countries/Oshela.md +++ b/Edikoyo/Countries/Oshela.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[oshela.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Ovanos.md b/Edikoyo/Countries/Ovanos.md index f635395..a9d9efb 100644 --- a/Edikoyo/Countries/Ovanos.md +++ b/Edikoyo/Countries/Ovanos.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[ovanos.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Seraphis.md b/Edikoyo/Countries/Seraphis.md index f635395..39b5781 100644 --- a/Edikoyo/Countries/Seraphis.md +++ b/Edikoyo/Countries/Seraphis.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[seraphis.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Soljord.md b/Edikoyo/Countries/Soljord.md index f635395..a2d71dc 100644 --- a/Edikoyo/Countries/Soljord.md +++ b/Edikoyo/Countries/Soljord.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[soljord.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Vanatn.md b/Edikoyo/Countries/Vanatn.md index f635395..6cc1427 100644 --- a/Edikoyo/Countries/Vanatn.md +++ b/Edikoyo/Countries/Vanatn.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[vanatn.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Vikogyna.md b/Edikoyo/Countries/Vikogyna.md index f635395..06d575b 100644 --- a/Edikoyo/Countries/Vikogyna.md +++ b/Edikoyo/Countries/Vikogyna.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[vikogyna.png]]" capital: language: --- diff --git a/Edikoyo/Countries/Vosaka.md b/Edikoyo/Countries/Vosaka.md index f635395..9aec4c3 100644 --- a/Edikoyo/Countries/Vosaka.md +++ b/Edikoyo/Countries/Vosaka.md @@ -1,6 +1,6 @@ --- short: -flag: +flag: "![[vosaka.png]]" capital: language: --- diff --git a/content/Countries/Nonkur.md b/content/Countries/Nonkur.md index 7343529..ed66313 100644 --- a/content/Countries/Nonkur.md +++ b/content/Countries/Nonkur.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[nonkur.png]]' capital: null language: null --- diff --git a/content/Countries/Oshela.md b/content/Countries/Oshela.md index 7343529..f446f20 100644 --- a/content/Countries/Oshela.md +++ b/content/Countries/Oshela.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[oshela.png]]' capital: null language: null --- diff --git a/content/Countries/Ovanos.md b/content/Countries/Ovanos.md index 7343529..d819c84 100644 --- a/content/Countries/Ovanos.md +++ b/content/Countries/Ovanos.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[ovanos.png]]' capital: null language: null --- diff --git a/content/Countries/Seraphis.md b/content/Countries/Seraphis.md index 7343529..b7b7a07 100644 --- a/content/Countries/Seraphis.md +++ b/content/Countries/Seraphis.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[seraphis.png]]' capital: null language: null --- diff --git a/content/Countries/Soljord.md b/content/Countries/Soljord.md index 7343529..5c8d926 100644 --- a/content/Countries/Soljord.md +++ b/content/Countries/Soljord.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[soljord.png]]' capital: null language: null --- diff --git a/content/Countries/Vanatn.md b/content/Countries/Vanatn.md index 7343529..98ba5fa 100644 --- a/content/Countries/Vanatn.md +++ b/content/Countries/Vanatn.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[vanatn.png]]' capital: null language: null --- diff --git a/content/Countries/Vikogyna.md b/content/Countries/Vikogyna.md index 7343529..d4af93a 100644 --- a/content/Countries/Vikogyna.md +++ b/content/Countries/Vikogyna.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[vikogyna.png]]' capital: null language: null --- diff --git a/content/Countries/Vosaka.md b/content/Countries/Vosaka.md index 7343529..bbf01a0 100644 --- a/content/Countries/Vosaka.md +++ b/content/Countries/Vosaka.md @@ -1,6 +1,6 @@ --- short: null -flag: null +flag: '![[vosaka.png]]' capital: null language: null --- From 0ec8e1f3d4120352c19fe5ca5f27bab1a53fca6c Mon Sep 17 00:00:00 2001 From: Ategon Date: Sat, 7 Sep 2024 01:43:48 -0400 Subject: [PATCH 2/2] vault backup: 2024-09-07 01:43:47 --- Edikoyo/.obsidian/workspace.json | 21 +++++++++++++-------- Edikoyo/Countries/Drenvale.md | 2 +- content/Countries/Drenvale.md | 2 +- content/conflict-files-obsidian-git.md | 22 ---------------------- 4 files changed, 15 insertions(+), 32 deletions(-) delete mode 100644 content/conflict-files-obsidian-git.md diff --git a/Edikoyo/.obsidian/workspace.json b/Edikoyo/.obsidian/workspace.json index 359c863..ae90611 100644 --- a/Edikoyo/.obsidian/workspace.json +++ b/Edikoyo/.obsidian/workspace.json @@ -95,10 +95,11 @@ "id": "6dd42c89cd0a32cf", "type": "leaf", "state": { - "type": "diff-view", + "type": "markdown", "state": { - "file": "Edikoyo/.obsidian/workspace.json", - "staged": false + "file": "Countries/Dratana.md", + "mode": "source", + "source": false } } } @@ -169,6 +170,7 @@ "state": { "type": "backlink", "state": { + "file": "Countries/Dratana.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", @@ -185,6 +187,7 @@ "state": { "type": "outgoing-link", "state": { + "file": "Countries/Dratana.md", "linksCollapsed": false, "unlinkedCollapsed": true } @@ -206,7 +209,9 @@ "type": "leaf", "state": { "type": "outline", - "state": {} + "state": { + "file": "Countries/Dratana.md" + } } }, { @@ -236,6 +241,10 @@ }, "active": "6dd42c89cd0a32cf", "lastOpenFiles": [ + "Countries/Drenvale.md", + "Countries/Faelani.md", + "Countries/Dratana.md", + "Countries/Hanoka.md", "conflict-files-obsidian-git.md", "Countries/Vosaka.md", "Images/slimes/ababa/ababa-3.png", @@ -259,15 +268,11 @@ "Countries/Lekia.md", "Countries/Lavaki.md", "Countries/Krakala.md", - "Countries/Hanoka.md", "Countries/Gudoko.md", "Countries/Gokolm.md", "Countries/Felmyr.md", "Countries/Falaka.md", - "Countries/Faelani.md", "Countries/Dolfeyja.md", - "Countries/Dratana.md", - "Countries/Drenvale.md", "Countries/Faelani", "Images/Flags/barrowmaw.png", "Animals/Slimes", diff --git a/Edikoyo/Countries/Drenvale.md b/Edikoyo/Countries/Drenvale.md index bd10ea1..56ceb84 100644 --- a/Edikoyo/Countries/Drenvale.md +++ b/Edikoyo/Countries/Drenvale.md @@ -1,6 +1,6 @@ --- short: flag: "![[drenvale.png]]" -language: capital: +language: --- diff --git a/content/Countries/Drenvale.md b/content/Countries/Drenvale.md index b5f0631..fd3d1f9 100644 --- a/content/Countries/Drenvale.md +++ b/content/Countries/Drenvale.md @@ -1,8 +1,8 @@ --- short: null flag: '![[drenvale.png]]' -language: null capital: null +language: null --- 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 -````