merge

Mausritter - First Campaign/.obsidian/plugins/obsidian-icon-folder/data.json

@@ -6,6 +6,7 @@
     "emojiStyle": "native",
     "iconColor": null,
     "recentlyUsedIcons": [
+      "🏆",
       "📖",
       "🐭",
       "🗺"
@@ -34,5 +35,6 @@
   },
   "NPCs": "🐭",
   "Mapa": "🗺",
-  "Lore": "📖"
+  "Lore": "📖",
+  "Kampaň": "🏆"
 }

Mausritter - First Campaign/.obsidian/workspace.json

@@ -13,12 +13,20 @@
             "state": {
               "type": "markdown",
               "state": {
+<<<<<<< HEAD
+                "file": "Kampaň/Kapitola 1.md",
+=======
                 "file": "Mapa/Oblasti/Farma.md",
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
+<<<<<<< HEAD
+              "title": "Kapitola 1"
+=======
               "title": "Farma"
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
             }
           }
         ]
@@ -114,11 +122,15 @@
             "state": {
               "type": "backlink",
               "state": {
+<<<<<<< HEAD
+                "file": "Kampaň/Kapitola 1.md",
+=======
 <<<<<<< HEAD
                 "file": "Lokace/Přehled.md",
 =======
                 "file": "_meta/templates/Race template.md",
 >>>>>>> b302b631d183f1798d610572411cea45bdd30127
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -128,11 +140,15 @@
                 "unlinkedCollapsed": true
               },
               "icon": "links-coming-in",
+<<<<<<< HEAD
+              "title": "Backlinks for Kapitola 1"
+=======
 <<<<<<< HEAD
               "title": "Backlinks for Přehled"
 =======
               "title": "Backlinks for Race template"
 >>>>>>> b302b631d183f1798d610572411cea45bdd30127
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
             }
           },
           {
@@ -141,20 +157,28 @@
             "state": {
               "type": "outgoing-link",
               "state": {
+<<<<<<< HEAD
+                "file": "Kampaň/Kapitola 1.md",
+=======
 <<<<<<< HEAD
                 "file": "Lokace/Přehled.md",
 =======
                 "file": "_meta/templates/Race template.md",
 >>>>>>> b302b631d183f1798d610572411cea45bdd30127
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               },
               "icon": "links-going-out",
+<<<<<<< HEAD
+              "title": "Outgoing links from Kapitola 1"
+=======
 <<<<<<< HEAD
               "title": "Outgoing links from Přehled"
 =======
               "title": "Outgoing links from Race template"
 >>>>>>> b302b631d183f1798d610572411cea45bdd30127
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
             }
           },
           {
@@ -178,20 +202,28 @@
             "state": {
               "type": "outline",
               "state": {
+<<<<<<< HEAD
+                "file": "Kampaň/Kapitola 1.md",
+=======
 <<<<<<< HEAD
                 "file": "Lokace/Přehled.md",
 =======
                 "file": "_meta/templates/Race template.md",
 >>>>>>> b302b631d183f1798d610572411cea45bdd30127
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
+<<<<<<< HEAD
+              "title": "Outline of Kapitola 1"
+=======
 <<<<<<< HEAD
               "title": "Outline of Přehled"
 =======
               "title": "Outline of Race template"
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
             }
           },
           {
@@ -230,14 +262,29 @@
 =======
   "active": "094e92a5832d9075",
   "lastOpenFiles": [
-    "NPCs/Rasy/Myši.md",
+    "Kampaň/Intro.md",
+    "Kampaň/Kapitola 1.md",
+    "Mapa/Přehled.md",
+    "Kampaň",
     "_meta/templates/Race template.md",
+    "NPCs/Rasy/Myši.md",
     "_meta/templates/Faction template.md",
     "Lore",
     "_meta/templates/Location template.md",
 >>>>>>> b302b631d183f1798d610572411cea45bdd30127
     "_meta/templates/NPC template.md",
+<<<<<<< HEAD
+    "Mapa/POIs",
+    "NPCs/Starosta.md",
+    "NPCs/Rasy",
+    "NPCs/Stat Bloky",
+    "Mapa/Oblasti/Domovská Vesnice.md",
+    "NPCs/Dřevorubcova žena.md",
+    "Untitledasdasd.md",
+    "_meta",
+=======
     "_meta/templates/Location template.md",
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
     "_meta/templates",
     "_meta",
     "NPCs/Rasy/Myši.md",
@@ -246,6 +293,9 @@
     "Mapa/Přehled.md",
     "Mapa/Oblasti/Farma.md",
     "Mapa/Oblasti/Krtčí nora.md",
+<<<<<<< HEAD
+    "Welcome.md"
+=======
     "Mapa/Oblasti/Domovská Vesnice.md",
     "Mapa/Oblasti/Pařez.md",
     "NPCs/Dřevorubcova žena.md",
@@ -254,5 +304,6 @@
     "NPCs",
     "Welcome.md",
     "Mapa"
+>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
   ]
 }