From f76136d613c84cf5dfcbfb357f592a428d456d2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20=C5=A0vr=C4=8Dina?= <msvrcina@memos.cz>
Date: Fri, 25 Jul 2025 13:14:53 +0200
Subject: [PATCH] 2025-07-25 13:14

---
 .../.obsidian/workspace.json                  | 50 ++-----------------
 1 file changed, 3 insertions(+), 47 deletions(-)

diff --git a/Mausritter - First Campaign/.obsidian/workspace.json b/Mausritter - First Campaign/.obsidian/workspace.json
index d749d51..ea56e4a 100644
--- a/Mausritter - First Campaign/.obsidian/workspace.json	
+++ b/Mausritter - First Campaign/.obsidian/workspace.json	
@@ -13,12 +13,12 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Mapa/Oblasti/Farma.md",
+                "file": "Mapa/Přehled.md",
                 "mode": "source",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Farma"
+              "title": "Přehled"
             }
           }
         ]
@@ -114,11 +114,7 @@
             "state": {
               "type": "backlink",
               "state": {
-<<<<<<< HEAD
                 "file": "Lokace/Přehled.md",
-=======
-                "file": "_meta/templates/Race template.md",
->>>>>>> b302b631d183f1798d610572411cea45bdd30127
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -128,11 +124,7 @@
                 "unlinkedCollapsed": true
               },
               "icon": "links-coming-in",
-<<<<<<< HEAD
               "title": "Backlinks for Přehled"
-=======
-              "title": "Backlinks for Race template"
->>>>>>> b302b631d183f1798d610572411cea45bdd30127
             }
           },
           {
@@ -141,20 +133,12 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-<<<<<<< HEAD
                 "file": "Lokace/Přehled.md",
-=======
-                "file": "_meta/templates/Race template.md",
->>>>>>> b302b631d183f1798d610572411cea45bdd30127
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               },
               "icon": "links-going-out",
-<<<<<<< HEAD
               "title": "Outgoing links from Přehled"
-=======
-              "title": "Outgoing links from Race template"
->>>>>>> b302b631d183f1798d610572411cea45bdd30127
             }
           },
           {
@@ -178,31 +162,13 @@
             "state": {
               "type": "outline",
               "state": {
-<<<<<<< HEAD
                 "file": "Lokace/Přehled.md",
-=======
-                "file": "_meta/templates/Race template.md",
->>>>>>> b302b631d183f1798d610572411cea45bdd30127
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-<<<<<<< HEAD
               "title": "Outline of Přehled"
-=======
-              "title": "Outline of Race template"
-            }
-          },
-          {
-            "id": "146b1289ce778b66",
-            "type": "leaf",
-            "state": {
-              "type": "DICE_ROLLER_VIEW",
-              "state": {},
-              "icon": "dices",
-              "title": "Dice Tray"
->>>>>>> b302b631d183f1798d610572411cea45bdd30127
             }
           }
         ]
@@ -222,20 +188,11 @@
       "command-palette:Open command palette": false
     }
   },
-<<<<<<< HEAD
   "active": "2ca7ef4fa79fc38e",
   "lastOpenFiles": [
+    "Mapa/Oblasti/Farma.md",
     "_meta/templates/Faction template.md",
     "_meta/templates/Race template.md",
-=======
-  "active": "094e92a5832d9075",
-  "lastOpenFiles": [
-    "NPCs/Rasy/Myši.md",
-    "_meta/templates/Race template.md",
-    "_meta/templates/Faction template.md",
-    "Lore",
-    "_meta/templates/Location template.md",
->>>>>>> b302b631d183f1798d610572411cea45bdd30127
     "_meta/templates/NPC template.md",
     "_meta/templates/Location template.md",
     "_meta/templates",
@@ -244,7 +201,6 @@
     "NPCs/Rasy",
     "NPCs/Farmář.md",
     "Mapa/Přehled.md",
-    "Mapa/Oblasti/Farma.md",
     "Mapa/Oblasti/Krtčí nora.md",
     "Mapa/Oblasti/Domovská Vesnice.md",
     "Mapa/Oblasti/Pařez.md",