Edikoyo/EdikoyoWiki
Edikoyo/EdikoyoWiki
1
1
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

vault backup: 2024-09-09 00:44:43

Browse source
This commit is contained in:
noah cuadrado 2024-09-09 00:44:43 +02:00
parent 1ad1573a04
commit 4220085ad7
2 changed files with 7 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Edikoyo/.obsidian/workspace.json vendored
View file

@ -95,25 +95,13 @@
"type": "markdown", "type": "markdown",
"state": { "state": {
"file": "Countries/Mantine.md", "file": "Countries/Mantine.md",
"mode": "source", "mode": "preview",
"source": false
}
}
},
{
"id": "7c0e510d9bbb8171",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "conflict-files-obsidian-git.md",
"mode": "source",
"source": false "source": false
} }
} }
} }
], ],
"currentTab": 8 "currentTab": 7
} }
], ],
"direction": "vertical" "direction": "vertical"
@ -179,7 +167,7 @@
"state": { "state": {
"type": "backlink", "type": "backlink",
"state": { "state": {
"file": "conflict-files-obsidian-git.md", "file": "Countries/Mantine.md",
"collapseAll": false, "collapseAll": false,
"extraContext": false, "extraContext": false,
"sortOrder": "alphabetical", "sortOrder": "alphabetical",
@ -196,7 +184,7 @@
"state": { "state": {
"type": "outgoing-link", "type": "outgoing-link",
"state": { "state": {
"file": "conflict-files-obsidian-git.md", "file": "Countries/Mantine.md",
"linksCollapsed": false, "linksCollapsed": false,
"unlinkedCollapsed": true "unlinkedCollapsed": true
} }
@ -219,7 +207,7 @@
"state": { "state": {
"type": "outline", "type": "outline",
"state": { "state": {
"file": "conflict-files-obsidian-git.md" "file": "Countries/Mantine.md"
} }
} }
}, },
@ -248,10 +236,10 @@
"obsidian-git:Open Git source control": false "obsidian-git:Open Git source control": false
} }
}, },
"active": "7c0e510d9bbb8171", "active": "0301fd3e66dac7f2",
"lastOpenFiles": [ "lastOpenFiles": [
"Countries/Mantine.md",
"conflict-files-obsidian-git.md", "conflict-files-obsidian-git.md",
"Countries/Mantine.md",
"Species/_index.md", "Species/_index.md",
"Species/Turian.md", "Species/Turian.md",
"Species", "Species",

4
Edikoyo/Countries/Mantine.md
View file

@ -4,7 +4,6 @@ flag: "![[mantine.png]]"
capital: capital:
language: language:
--- ---
<<<<<<< HEAD
Mantine was a calm region for part of its history; some small cities formed, but growth was slow and dispersed throughout the region.  Mantine was a calm region for part of its history; some small cities formed, but growth was slow and dispersed throughout the region. 
@ -23,6 +22,3 @@ One of the earliest depictions of diplomacy appeared through this era between th
The most tense event from this period occurred when a party of Medine's Army tried getting some steel to Sidone's port, where a ship from another country was waiting. The Queen of Sidone retained this party for a time; she wouldn't allow this to happen without some competition for the crown.  The most tense event from this period occurred when a party of Medine's Army tried getting some steel to Sidone's port, where a ship from another country was waiting. The Queen of Sidone retained this party for a time; she wouldn't allow this to happen without some competition for the crown. 
While this happened, The Great Storm of Mantine started. While this happened, The Great Storm of Mantine started.
=======
To be added
>>>>>>> origin/main