Stedd
/
Marcandria_DnD_Notes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deleted conflict files

This commit is contained in:
Stedd 2023-02-10 15:07:02 +01:00
parent 132c3d9a4d
commit 33cc64e2f2
4 changed files with 0 additions and 295 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.obsidian/appearance(Conflicted).json vendored
View File

@ -1 +0,0 @@
{}

19
.obsidian/core-plugins(Conflicted).json vendored
View File

@ -1,19 +0,0 @@
[
"file-explorer",
"global-search",
"switcher",
"graph",
"backlink",
"outgoing-link",
"tag-pane",
"page-preview",
"daily-notes",
"templates",
"note-composer",
"command-palette",
"editor-status",
"starred",
"outline",
"word-count",
"file-recovery"
]

125
.obsidian/workspace(Conflicted) vendored
View File

@ -1,125 +0,0 @@
{
"main": {
"id": "30811cc75f922a65",
"type": "split",
"children": [
{
"id": "f7fe9cfe81ca09a6",
"type": "leaf",
"state": {
"type": "empty",
"state": {}
}
}
],
"direction": "vertical"
},
"left": {
"id": "cdd37312b63d7e0a",
"type": "split",
"children": [
{
"id": "4b9f2a5c79452927",
"type": "tabs",
"children": [
{
"id": "390e7e23a5868758",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {}
}
},
{
"id": "ac69540e0ee1c226",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
}
}
},
{
"id": "418205df5324ec0b",
"type": "leaf",
"state": {
"type": "starred",
"state": {}
}
}
]
}
],
"direction": "horizontal",
"width": 300
},
"right": {
"id": "f13e02318ac7c075",
"type": "split",
"children": [
{
"id": "057fdf476c11f42a",
"type": "tabs",
"children": [
{
"id": "d02b013eeb1cee40",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
}
}
},
{
"id": "2bceeaa4491f23de",
"type": "leaf",
"state": {
"type": "outgoing-link",
"state": {
"linksCollapsed": false,
"unlinkedCollapsed": true
}
}
},
{
"id": "49d867b992f6720b",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true
}
}
},
{
"id": "0530bc9e69173cca",
"type": "leaf",
"state": {
"type": "outline",
"state": {}
}
}
]
}
],
"direction": "horizontal",
"width": 300,
"collapsed": true
},
"active": "f7fe9cfe81ca09a6",
"lastOpenFiles": []
}

150
.obsidian/workspace(Conflicted).json vendored
View File

@ -1,150 +0,0 @@
{
"main": {
"id": "30811cc75f922a65",
"type": "split",
"children": [
{
"id": "0492b7683dc76094",
"type": "tabs",
"children": [
{
"id": "f7fe9cfe81ca09a6",
"type": "leaf",
"state": {
"type": "markdown",
"state": {
"file": "Untitled.md",
"mode": "source",
"source": false
}
}
}
]
}
],
"direction": "vertical"
},
"left": {
"id": "cdd37312b63d7e0a",
"type": "split",
"children": [
{
"id": "4b9f2a5c79452927",
"type": "tabs",
"children": [
{
"id": "390e7e23a5868758",
"type": "leaf",
"state": {
"type": "file-explorer",
"state": {
"sortOrder": "alphabetical"
}
}
},
{
"id": "ac69540e0ee1c226",
"type": "leaf",
"state": {
"type": "search",
"state": {
"query": "",
"matchingCase": false,
"explainSearch": false,
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical"
}
}
},
{
"id": "418205df5324ec0b",
"type": "leaf",
"state": {
"type": "starred",
"state": {}
}
}
]
}
],
"direction": "horizontal",
"width": 300
},
"right": {
"id": "f13e02318ac7c075",
"type": "split",
"children": [
{
"id": "057fdf476c11f42a",
"type": "tabs",
"children": [
{
"id": "d02b013eeb1cee40",
"type": "leaf",
"state": {
"type": "backlink",
"state": {
"file": "Untitled.md",
"collapseAll": false,
"extraContext": false,
"sortOrder": "alphabetical",
"showSearch": false,
"searchQuery": "",
"backlinkCollapsed": false,
"unlinkedCollapsed": true
}
}
},
{
"id": "2bceeaa4491f23de",
"type": "leaf",
"state": {
"type": "outgoing-link",
"state": {
"file": "Untitled.md",
"linksCollapsed": false,
"unlinkedCollapsed": true
}
}
},
{
"id": "49d867b992f6720b",
"type": "leaf",
"state": {
"type": "tag",
"state": {
"sortOrder": "frequency",
"useHierarchy": true
}
}
},
{
"id": "0530bc9e69173cca",
"type": "leaf",
"state": {
"type": "outline",
"state": {
"file": "Untitled.md"
}
}
}
]
}
],
"direction": "horizontal",
"width": 300
},
"left-ribbon": {
"hiddenItems": {
"switcher:Open quick switcher": false,
"graph:Open graph view": false,
"canvas:Create new canvas": false,
"daily-notes:Open today's daily note": false,
"templates:Insert template": false,
"command-palette:Open command palette": false
}
},
"active": "390e7e23a5868758",
"lastOpenFiles": []
}