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

Edikoyo/.obsidian/workspace.json

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

Edikoyo/Countries/Mantine.md

@@ -4,7 +4,6 @@ flag: "![[mantine.png]]"
 capital: 
 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. 
 
@@ -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. 
 
 While this happened, The Great Storm of Mantine started.
-=======
-To be added
->>>>>>> origin/main