Compare commits
No commits in common. "0fd3aa6a8ad606b787b70d40f1923dc7ed10ac6e" and "07dd770e840fa6b42fe8e60c98779ac753d591dd" have entirely different histories.
0fd3aa6a8a
...
07dd770e84
@ -6,7 +6,6 @@
|
|||||||
"emojiStyle": "native",
|
"emojiStyle": "native",
|
||||||
"iconColor": null,
|
"iconColor": null,
|
||||||
"recentlyUsedIcons": [
|
"recentlyUsedIcons": [
|
||||||
"🏆",
|
|
||||||
"📖",
|
"📖",
|
||||||
"🐭",
|
"🐭",
|
||||||
"🗺"
|
"🗺"
|
||||||
@ -35,6 +34,5 @@
|
|||||||
},
|
},
|
||||||
"NPCs": "🐭",
|
"NPCs": "🐭",
|
||||||
"Mapa": "🗺",
|
"Mapa": "🗺",
|
||||||
"Lore": "📖",
|
"Lore": "📖"
|
||||||
"Kampaň": "🏆"
|
|
||||||
}
|
}
|
||||||
@ -13,20 +13,12 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "markdown",
|
"type": "markdown",
|
||||||
"state": {
|
"state": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"file": "Kampaň/Kapitola 1.md",
|
|
||||||
=======
|
|
||||||
"file": "Mapa/Oblasti/Farma.md",
|
"file": "Mapa/Oblasti/Farma.md",
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
"mode": "source",
|
"mode": "source",
|
||||||
"source": false
|
"source": false
|
||||||
},
|
},
|
||||||
"icon": "lucide-file",
|
"icon": "lucide-file",
|
||||||
<<<<<<< HEAD
|
|
||||||
"title": "Kapitola 1"
|
|
||||||
=======
|
|
||||||
"title": "Farma"
|
"title": "Farma"
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
@ -122,15 +114,11 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "backlink",
|
"type": "backlink",
|
||||||
"state": {
|
"state": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"file": "Kampaň/Kapitola 1.md",
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"file": "Lokace/Přehled.md",
|
"file": "Lokace/Přehled.md",
|
||||||
=======
|
=======
|
||||||
"file": "_meta/templates/Race template.md",
|
"file": "_meta/templates/Race template.md",
|
||||||
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
"collapseAll": false,
|
"collapseAll": false,
|
||||||
"extraContext": false,
|
"extraContext": false,
|
||||||
"sortOrder": "alphabetical",
|
"sortOrder": "alphabetical",
|
||||||
@ -140,15 +128,11 @@
|
|||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
},
|
},
|
||||||
"icon": "links-coming-in",
|
"icon": "links-coming-in",
|
||||||
<<<<<<< HEAD
|
|
||||||
"title": "Backlinks for Kapitola 1"
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"title": "Backlinks for Přehled"
|
"title": "Backlinks for Přehled"
|
||||||
=======
|
=======
|
||||||
"title": "Backlinks for Race template"
|
"title": "Backlinks for Race template"
|
||||||
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -157,28 +141,20 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "outgoing-link",
|
"type": "outgoing-link",
|
||||||
"state": {
|
"state": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"file": "Kampaň/Kapitola 1.md",
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"file": "Lokace/Přehled.md",
|
"file": "Lokace/Přehled.md",
|
||||||
=======
|
=======
|
||||||
"file": "_meta/templates/Race template.md",
|
"file": "_meta/templates/Race template.md",
|
||||||
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
"linksCollapsed": false,
|
"linksCollapsed": false,
|
||||||
"unlinkedCollapsed": true
|
"unlinkedCollapsed": true
|
||||||
},
|
},
|
||||||
"icon": "links-going-out",
|
"icon": "links-going-out",
|
||||||
<<<<<<< HEAD
|
|
||||||
"title": "Outgoing links from Kapitola 1"
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"title": "Outgoing links from Přehled"
|
"title": "Outgoing links from Přehled"
|
||||||
=======
|
=======
|
||||||
"title": "Outgoing links from Race template"
|
"title": "Outgoing links from Race template"
|
||||||
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -202,28 +178,20 @@
|
|||||||
"state": {
|
"state": {
|
||||||
"type": "outline",
|
"type": "outline",
|
||||||
"state": {
|
"state": {
|
||||||
<<<<<<< HEAD
|
|
||||||
"file": "Kampaň/Kapitola 1.md",
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"file": "Lokace/Přehled.md",
|
"file": "Lokace/Přehled.md",
|
||||||
=======
|
=======
|
||||||
"file": "_meta/templates/Race template.md",
|
"file": "_meta/templates/Race template.md",
|
||||||
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
"followCursor": false,
|
"followCursor": false,
|
||||||
"showSearch": false,
|
"showSearch": false,
|
||||||
"searchQuery": ""
|
"searchQuery": ""
|
||||||
},
|
},
|
||||||
"icon": "lucide-list",
|
"icon": "lucide-list",
|
||||||
<<<<<<< HEAD
|
|
||||||
"title": "Outline of Kapitola 1"
|
|
||||||
=======
|
|
||||||
<<<<<<< HEAD
|
<<<<<<< HEAD
|
||||||
"title": "Outline of Přehled"
|
"title": "Outline of Přehled"
|
||||||
=======
|
=======
|
||||||
"title": "Outline of Race template"
|
"title": "Outline of Race template"
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -262,29 +230,14 @@
|
|||||||
=======
|
=======
|
||||||
"active": "094e92a5832d9075",
|
"active": "094e92a5832d9075",
|
||||||
"lastOpenFiles": [
|
"lastOpenFiles": [
|
||||||
"Kampaň/Intro.md",
|
|
||||||
"Kampaň/Kapitola 1.md",
|
|
||||||
"Mapa/Přehled.md",
|
|
||||||
"Kampaň",
|
|
||||||
"_meta/templates/Race template.md",
|
|
||||||
"NPCs/Rasy/Myši.md",
|
"NPCs/Rasy/Myši.md",
|
||||||
|
"_meta/templates/Race template.md",
|
||||||
"_meta/templates/Faction template.md",
|
"_meta/templates/Faction template.md",
|
||||||
"Lore",
|
"Lore",
|
||||||
"_meta/templates/Location template.md",
|
"_meta/templates/Location template.md",
|
||||||
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
>>>>>>> b302b631d183f1798d610572411cea45bdd30127
|
||||||
"_meta/templates/NPC template.md",
|
"_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",
|
"_meta/templates/Location template.md",
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
"_meta/templates",
|
"_meta/templates",
|
||||||
"_meta",
|
"_meta",
|
||||||
"NPCs/Rasy/Myši.md",
|
"NPCs/Rasy/Myši.md",
|
||||||
@ -293,9 +246,6 @@
|
|||||||
"Mapa/Přehled.md",
|
"Mapa/Přehled.md",
|
||||||
"Mapa/Oblasti/Farma.md",
|
"Mapa/Oblasti/Farma.md",
|
||||||
"Mapa/Oblasti/Krtčí nora.md",
|
"Mapa/Oblasti/Krtčí nora.md",
|
||||||
<<<<<<< HEAD
|
|
||||||
"Welcome.md"
|
|
||||||
=======
|
|
||||||
"Mapa/Oblasti/Domovská Vesnice.md",
|
"Mapa/Oblasti/Domovská Vesnice.md",
|
||||||
"Mapa/Oblasti/Pařez.md",
|
"Mapa/Oblasti/Pařez.md",
|
||||||
"NPCs/Dřevorubcova žena.md",
|
"NPCs/Dřevorubcova žena.md",
|
||||||
@ -304,6 +254,5 @@
|
|||||||
"NPCs",
|
"NPCs",
|
||||||
"Welcome.md",
|
"Welcome.md",
|
||||||
"Mapa"
|
"Mapa"
|
||||||
>>>>>>> 07dd770e840fa6b42fe8e60c98779ac753d591dd
|
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
Loading…
Reference in New Issue
Block a user